[CalendarServer-changes] [11878] CalendarServer/trunk/twext/who/test
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:17:48 PDT 2014
Revision: 11878
http://trac.calendarserver.org//changeset/11878
Author: wsanchez at apple.com
Date: 2013-11-01 17:09:02 -0700 (Fri, 01 Nov 2013)
Log Message:
-----------
cosmetic
Modified Paths:
--------------
CalendarServer/trunk/twext/who/test/test_aggregate.py
CalendarServer/trunk/twext/who/test/test_util.py
CalendarServer/trunk/twext/who/test/test_xml.py
Modified: CalendarServer/trunk/twext/who/test/test_aggregate.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_aggregate.py 2013-11-01 23:55:30 UTC (rev 11877)
+++ CalendarServer/trunk/twext/who/test/test_aggregate.py 2013-11-02 00:09:02 UTC (rev 11878)
@@ -69,7 +69,10 @@
-class DirectoryServiceImmutableTest(BaseTest, test_directory.BaseDirectoryServiceImmutableTest):
+class DirectoryServiceImmutableTest(
+ BaseTest,
+ test_directory.BaseDirectoryServiceImmutableTest,
+):
pass
@@ -82,24 +85,39 @@
class GroupsDirectoryService(XMLTestService):
recordType = ConstantsContainer((XMLTestService.recordType.group,))
- usersService = self.xmlService(testXMLConfigUsers, UsersDirectoryService)
- groupsService = self.xmlService(testXMLConfigGroups, GroupsDirectoryService)
+ usersService = self.xmlService(
+ testXMLConfigUsers,
+ UsersDirectoryService
+ )
+ groupsService = self.xmlService(
+ testXMLConfigGroups,
+ GroupsDirectoryService
+ )
return BaseTest.service(self, (usersService, groupsService))
-class DirectoryServiceAggregatedBaseTest(AggregatedBaseTest, DirectoryServiceBaseTest):
+class DirectoryServiceAggregatedBaseTest(
+ AggregatedBaseTest,
+ DirectoryServiceBaseTest,
+):
pass
-class DirectoryServiceAggregatedQueryTest(AggregatedBaseTest, test_xml.DirectoryServiceQueryTest):
+class DirectoryServiceAggregatedQueryTest(
+ AggregatedBaseTest,
+ test_xml.DirectoryServiceQueryTest,
+):
pass
-class DirectoryServiceAggregatedImmutableTest(AggregatedBaseTest, test_directory.BaseDirectoryServiceImmutableTest):
+class DirectoryServiceAggregatedImmutableTest(
+ AggregatedBaseTest,
+ test_directory.BaseDirectoryServiceImmutableTest,
+):
pass
Modified: CalendarServer/trunk/twext/who/test/test_util.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_util.py 2013-11-01 23:55:30 UTC (rev 11877)
+++ CalendarServer/trunk/twext/who/test/test_util.py 2013-11-02 00:09:02 UTC (rev 11878)
@@ -82,7 +82,11 @@
)
def test_lookupByName(self):
- constants = set((Instruments.hammer, Tools.screwdriver, Instruments.chisel))
+ constants = set((
+ Instruments.hammer,
+ Tools.screwdriver,
+ Instruments.chisel,
+ ))
container = ConstantsContainer(constants)
self.assertEquals(
@@ -108,7 +112,7 @@
class UtilTest(unittest.TestCase):
def test_uniqueResult(self):
self.assertEquals(1, uniqueResult((1,)))
- self.assertRaises(DirectoryServiceError, uniqueResult, (1,2,3))
+ self.assertRaises(DirectoryServiceError, uniqueResult, (1, 2, 3))
def test_describe(self):
self.assertEquals("nail pounder", describe(Tools.hammer))
@@ -116,5 +120,5 @@
def test_describeFlags(self):
self.assertEquals("blue", describe(Switches.b))
- self.assertEquals("red|green", describe(Switches.r|Switches.g))
- self.assertEquals("blue|black", describe(Switches.b|Switches.black))
+ self.assertEquals("red|green", describe(Switches.r | Switches.g))
+ self.assertEquals("blue|black", describe(Switches.b | Switches.black))
Modified: CalendarServer/trunk/twext/who/test/test_xml.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_xml.py 2013-11-01 23:55:30 UTC (rev 11877)
+++ CalendarServer/trunk/twext/who/test/test_xml.py 2013-11-02 00:09:02 UTC (rev 11878)
@@ -47,7 +47,10 @@
-class DirectoryServiceBaseTest(BaseTest, test_directory.BaseDirectoryServiceTest):
+class DirectoryServiceBaseTest(
+ BaseTest,
+ test_directory.BaseDirectoryServiceTest,
+):
def test_repr(self):
service = self.service()
@@ -70,7 +73,11 @@
@inlineCallbacks
def test_recordWithGUID(self):
service = self.service()
- record = (yield service.recordWithGUID("6C495FCD-7E78-4D5C-AA66-BC890AD04C9D"))
+ record = (
+ yield service.recordWithGUID(
+ "6C495FCD-7E78-4D5C-AA66-BC890AD04C9D"
+ )
+ )
self.assertEquals(record, None)
@inlineCallbacks
@@ -80,8 +87,11 @@
records = (yield service.recordsWithRecordType(object()))
self.assertEquals(set(records), set())
- records = (yield service.recordsWithRecordType(service.recordType.user))
- self.assertRecords(records,
+ records = (
+ yield service.recordsWithRecordType(service.recordType.user)
+ )
+ self.assertRecords(
+ records,
(
"__wsanchez__",
"__glyph__",
@@ -95,8 +105,11 @@
),
)
- records = (yield service.recordsWithRecordType(service.recordType.group))
- self.assertRecords(records,
+ records = (
+ yield service.recordsWithRecordType(service.recordType.group)
+ )
+ self.assertRecords(
+ records,
(
"__calendar-dev__",
"__twisted__",
@@ -109,13 +122,28 @@
def test_recordWithShortName(self):
service = self.service()
- record = (yield service.recordWithShortName(service.recordType.user, "null"))
+ record = (
+ yield service.recordWithShortName(
+ service.recordType.user,
+ "null",
+ )
+ )
self.assertEquals(record, None)
- record = (yield service.recordWithShortName(service.recordType.user, "wsanchez"))
+ record = (
+ yield service.recordWithShortName(
+ service.recordType.user,
+ "wsanchez",
+ )
+ )
self.assertEquals(record.uid, "__wsanchez__")
- record = (yield service.recordWithShortName(service.recordType.user, "wilfredo_sanchez"))
+ record = (
+ yield service.recordWithShortName(
+ service.recordType.user,
+ "wilfredo_sanchez",
+ )
+ )
self.assertEquals(record.uid, "__wsanchez__")
@@ -123,13 +151,25 @@
def test_recordsWithEmailAddress(self):
service = self.service()
- records = (yield service.recordsWithEmailAddress("wsanchez at bitbucket.calendarserver.org"))
+ records = (
+ yield service.recordsWithEmailAddress(
+ "wsanchez at bitbucket.calendarserver.org"
+ )
+ )
self.assertRecords(records, ("__wsanchez__",))
- records = (yield service.recordsWithEmailAddress("wsanchez at devnull.twistedmatrix.com"))
+ records = (
+ yield service.recordsWithEmailAddress(
+ "wsanchez at devnull.twistedmatrix.com"
+ )
+ )
self.assertRecords(records, ("__wsanchez__",))
- records = (yield service.recordsWithEmailAddress("shared at example.com"))
+ records = (
+ yield service.recordsWithEmailAddress(
+ "shared at example.com"
+ )
+ )
self.assertRecords(records, ("__sagen__", "__dre__"))
@@ -176,12 +216,12 @@
def test_badRootElement(self):
- service = self.service(xmlData=
+ service = self.service(xmlData=(
"""<?xml version="1.0" encoding="utf-8"?>
<frobnitz />
"""
- )
+ ))
self.assertRaises(ParseError, service.loadRecords)
try:
@@ -193,12 +233,12 @@
def test_noRealmName(self):
- service = self.service(xmlData=
+ service = self.service(xmlData=(
"""<?xml version="1.0" encoding="utf-8"?>
<directory />
"""
- )
+ ))
self.assertRaises(ParseError, service.loadRecords)
try:
@@ -215,7 +255,7 @@
def test_unknownFieldElementsDirty(self):
- service = self.service(xmlData=
+ service = self.service(xmlData=(
"""<?xml version="1.0" encoding="utf-8"?>
<directory realm="Unknown Record Types">
@@ -226,8 +266,11 @@
</record>
</directory>
"""
+ ))
+ self.assertEquals(
+ set(service.unknownFieldElements),
+ set(("political-affiliation",))
)
- self.assertEquals(set(service.unknownFieldElements), set(("political-affiliation",)))
def test_unknownRecordTypesClean(self):
@@ -236,7 +279,7 @@
def test_unknownRecordTypesDirty(self):
- service = self.service(xmlData=
+ service = self.service(xmlData=(
"""<?xml version="1.0" encoding="utf-8"?>
<directory realm="Unknown Record Types">
@@ -247,7 +290,7 @@
</record>
</directory>
"""
- )
+ ))
self.assertEquals(set(service.unknownRecordTypes), set(("camera",)))
@@ -314,7 +357,10 @@
records = yield service.recordsFromQuery(
(
service.query("emailAddresses", "shared at example.com"),
- service.query("fullNames", "Andre LaBranche", flags=MatchFlags.NOT),
+ service.query(
+ "fullNames", "Andre LaBranche",
+ flags=MatchFlags.NOT
+ ),
),
operand=Operand.AND
)
@@ -325,7 +371,10 @@
def test_queryCaseInsensitive(self):
service = self.service()
records = yield service.recordsFromQuery((
- service.query("shortNames", "SagEn", flags=MatchFlags.caseInsensitive),
+ service.query(
+ "shortNames", "SagEn",
+ flags=MatchFlags.caseInsensitive
+ ),
))
self.assertRecords(records, ("__sagen__",))
@@ -334,7 +383,10 @@
def test_queryCaseInsensitiveNoIndex(self):
service = self.service()
records = yield service.recordsFromQuery((
- service.query("fullNames", "moRGen SAGen", flags=MatchFlags.caseInsensitive),
+ service.query(
+ "fullNames", "moRGen SAGen",
+ flags=MatchFlags.caseInsensitive
+ ),
))
self.assertRecords(records, ("__sagen__",))
@@ -352,7 +404,10 @@
def test_queryStartsWithNoIndex(self):
service = self.service()
records = yield service.recordsFromQuery((
- service.query("fullNames", "Wilfredo", matchType=MatchType.startsWith),
+ service.query(
+ "fullNames", "Wilfredo",
+ matchType=MatchType.startsWith
+ ),
))
self.assertRecords(records, ("__wsanchez__",))
@@ -363,8 +418,8 @@
records = yield service.recordsFromQuery((
service.query(
"shortNames", "w",
- matchType = MatchType.startsWith,
- flags = MatchFlags.NOT,
+ matchType=MatchType.startsWith,
+ flags=MatchFlags.NOT,
),
))
self.assertRecords(
@@ -397,8 +452,8 @@
records = yield service.recordsFromQuery((
service.query(
"shortNames", "wil",
- matchType = MatchType.startsWith,
- flags = MatchFlags.NOT,
+ matchType=MatchType.startsWith,
+ flags=MatchFlags.NOT,
),
))
self.assertRecords(
@@ -426,8 +481,8 @@
records = yield service.recordsFromQuery((
service.query(
"fullNames", "Wilfredo",
- matchType = MatchType.startsWith,
- flags = MatchFlags.NOT,
+ matchType=MatchType.startsWith,
+ flags=MatchFlags.NOT,
),
))
self.assertRecords(
@@ -454,8 +509,8 @@
records = yield service.recordsFromQuery((
service.query(
"shortNames", "WIL",
- matchType = MatchType.startsWith,
- flags = MatchFlags.caseInsensitive,
+ matchType=MatchType.startsWith,
+ flags=MatchFlags.caseInsensitive,
),
))
self.assertRecords(records, ("__wsanchez__",))
@@ -467,8 +522,8 @@
records = yield service.recordsFromQuery((
service.query(
"fullNames", "wilfrEdo",
- matchType = MatchType.startsWith,
- flags = MatchFlags.caseInsensitive,
+ matchType=MatchType.startsWith,
+ flags=MatchFlags.caseInsensitive,
),
))
self.assertRecords(records, ("__wsanchez__",))
@@ -478,7 +533,10 @@
def test_queryContains(self):
service = self.service()
records = yield service.recordsFromQuery((
- service.query("shortNames", "sanchez", matchType=MatchType.contains),
+ service.query(
+ "shortNames", "sanchez",
+ matchType=MatchType.contains
+ ),
))
self.assertRecords(records, ("__wsanchez__",))
@@ -498,8 +556,8 @@
records = yield service.recordsFromQuery((
service.query(
"shortNames", "sanchez",
- matchType = MatchType.contains,
- flags = MatchFlags.NOT,
+ matchType=MatchType.contains,
+ flags=MatchFlags.NOT,
),
))
self.assertRecords(
@@ -526,8 +584,8 @@
records = yield service.recordsFromQuery((
service.query(
"fullNames", "fred",
- matchType = MatchType.contains,
- flags = MatchFlags.NOT,
+ matchType=MatchType.contains,
+ flags=MatchFlags.NOT,
),
))
self.assertRecords(
@@ -590,12 +648,18 @@
# Verify change is present immediately
record = (yield service.recordWithUID("__wsanchez__"))
- self.assertEquals(set(record.fullNames), set(("Wilfredo Sanchez Vega",)))
+ self.assertEquals(
+ set(record.fullNames),
+ set(("Wilfredo Sanchez Vega",))
+ )
# Verify change is persisted
service.flush()
record = (yield service.recordWithUID("__wsanchez__"))
- self.assertEquals(set(record.fullNames), set(("Wilfredo Sanchez Vega",)))
+ self.assertEquals(
+ set(record.fullNames),
+ set(("Wilfredo Sanchez Vega",))
+ )
@inlineCallbacks
@@ -604,7 +668,7 @@
newRecord = DirectoryRecord(
service,
- fields = {
+ fields={
service.fieldName.uid: "__plugh__",
service.fieldName.recordType: service.recordType.user,
service.fieldName.shortNames: ("plugh",),
@@ -628,14 +692,17 @@
newRecord = DirectoryRecord(
service,
- fields = {
+ fields={
service.fieldName.uid: "__plugh__",
service.fieldName.recordType: service.recordType.user,
service.fieldName.shortNames: ("plugh",),
}
)
- self.assertFailure(service.updateRecords((newRecord,)), NoSuchRecordError)
+ self.assertFailure(
+ service.updateRecords((newRecord,)),
+ NoSuchRecordError
+ )
@inlineCallbacks
@@ -714,8 +781,8 @@
assert name is not None
return MatchExpression(
name, value,
- matchType = matchType,
- flags = flags,
+ matchType=matchType,
+ flags=flags,
)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/abb2dddf/attachment.html>
More information about the calendarserver-changes
mailing list