[CalendarServer-changes] [10666] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 8 09:05:13 PST 2013
Revision: 10666
http://trac.calendarserver.org//changeset/10666
Author: cdaboo at apple.com
Date: 2013-02-08 09:05:13 -0800 (Fri, 08 Feb 2013)
Log Message:
-----------
Clean-up.
Modified Paths:
--------------
CalendarServer/trunk/twext/__init__.py
CalendarServer/trunk/twistedcaldav/directory/test/test_directory.py
CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py
Modified: CalendarServer/trunk/twext/__init__.py
===================================================================
--- CalendarServer/trunk/twext/__init__.py 2013-02-08 01:55:53 UTC (rev 10665)
+++ CalendarServer/trunk/twext/__init__.py 2013-02-08 17:05:13 UTC (rev 10666)
@@ -15,8 +15,9 @@
##
"""
-Extentions to the Twisted Framework.
+Extensions to the Twisted Framework.
"""
from twext import patches
-patches; del(patches)
+patches
+del(patches)
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_directory.py 2013-02-08 01:55:53 UTC (rev 10665)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_directory.py 2013-02-08 17:05:13 UTC (rev 10666)
@@ -40,6 +40,8 @@
return 0
return 1
+
+
class SACLTests(TestCase):
def setUp(self):
@@ -59,10 +61,10 @@
"""
data = [
- ("amanda", True, True,),
- ("betty", True, False,),
+ ("amanda", True, True,),
+ ("betty", True, False,),
("carlene", False, True,),
- ("daniel", False, False,),
+ ("daniel", False, False,),
]
for username, cal, ab in data:
record = DirectoryRecord(self.service, "users", None, (username,),
@@ -71,6 +73,8 @@
self.assertEquals(record.enabledForCalendaring, cal)
self.assertEquals(record.enabledForAddressBooks, ab)
+
+
class GroupMembershipTests (TestCase):
@inlineCallbacks
@@ -99,20 +103,24 @@
yield XMLCalendarUserProxyLoader(proxiesFile.path).updateProxyDB()
+
def tearDown(self):
""" Empty the proxy db between tests """
- return calendaruserproxy.ProxyDBService.clean()
+ return calendaruserproxy.ProxyDBService.clean() #@UndefinedVariable
+
def _getPrincipalByShortName(self, type, name):
provisioningResource = self.principalRootResources[self.directoryService.__class__.__name__]
return provisioningResource.principalForShortName(type, name)
+
def _updateMethod(self):
"""
Update a counter in the following test
"""
self.count += 1
+
@inlineCallbacks
def test_groupMembershipCacherService(self):
"""
@@ -153,7 +161,6 @@
self.assertFalse(service.updateAwaiting)
-
def test_expandedMembers(self):
"""
Make sure expandedMembers( ) returns a complete, flattened set of
@@ -193,8 +200,6 @@
self.assertEquals(members, set())
-
-
@inlineCallbacks
def test_groupMembershipCacheUpdater(self):
"""
@@ -569,6 +574,7 @@
groups,
)
+
def test_diffAssignments(self):
"""
Ensure external proxy assignment diffing works
@@ -577,80 +583,79 @@
self.assertEquals(
(
# changed
- [ ],
+ [],
# removed
- [ ],
+ [],
),
diffAssignments(
# old
- [ ],
+ [],
# new
- [ ],
+ [],
)
)
self.assertEquals(
(
# changed
- [ ],
+ [],
# removed
- [ ],
+ [],
),
diffAssignments(
# old
- [ ("B", set(["3"])), ("A", set(["1", "2"])), ],
+ [("B", set(["3"])), ("A", set(["1", "2"])), ],
# new
- [ ("A", set(["1", "2"])), ("B", set(["3"])), ],
+ [("A", set(["1", "2"])), ("B", set(["3"])), ],
)
)
self.assertEquals(
(
# changed
- [ ("A", set(["1", "2"])), ("B", set(["3"])), ],
+ [("A", set(["1", "2"])), ("B", set(["3"])), ],
# removed
- [ ],
+ [],
),
diffAssignments(
# old
- [ ],
+ [],
# new
- [ ("A", set(["1", "2"])), ("B", set(["3"])), ],
+ [("A", set(["1", "2"])), ("B", set(["3"])), ],
)
)
self.assertEquals(
(
# changed
- [ ],
+ [],
# removed
- [ "A", "B" ],
+ ["A", "B"],
),
diffAssignments(
# old
- [ ("A", set(["1", "2"])), ("B", set(["3"])), ],
+ [("A", set(["1", "2"])), ("B", set(["3"])), ],
# new
- [ ],
+ [],
)
)
self.assertEquals(
(
# changed
- [ ("A", set(["2"])), ("C", set(["4", "5"])), ("D", set(["6"])), ],
+ [("A", set(["2"])), ("C", set(["4", "5"])), ("D", set(["6"])), ],
# removed
- [ "B" ],
+ ["B"],
),
diffAssignments(
# old
- [ ("A", set(["1", "2"])), ("B", set(["3"])), ("C", set(["4"])), ],
+ [("A", set(["1", "2"])), ("B", set(["3"])), ("C", set(["4"])), ],
# new
- [ ("D", set(["6"])), ("C", set(["4", "5"])), ("A", set(["2"])), ],
+ [("D", set(["6"])), ("C", set(["4", "5"])), ("A", set(["2"])), ],
)
)
-
@inlineCallbacks
def test_groupMembershipCacheSnapshot(self):
"""
@@ -757,6 +762,7 @@
}
)
+
def test_autoAcceptMembers(self):
"""
autoAcceptMembers( ) returns an empty list if no autoAcceptGroup is
@@ -765,7 +771,7 @@
# No auto-accept-group for "orion" in augments.xml
orion = self.directoryService.recordWithGUID("orion")
- self.assertEquals( orion.autoAcceptMembers(), [])
+ self.assertEquals(orion.autoAcceptMembers(), [])
# "both_coasts" group assigned to "apollo" in augments.xml
apollo = self.directoryService.recordWithGUID("apollo")
@@ -781,6 +787,8 @@
])
)
+
+
class RecordsMatchingTokensTests(TestCase):
@inlineCallbacks
@@ -809,10 +817,12 @@
yield XMLCalendarUserProxyLoader(proxiesFile.path).updateProxyDB()
+
def tearDown(self):
""" Empty the proxy db between tests """
- return calendaruserproxy.ProxyDBService.clean()
+ return calendaruserproxy.ProxyDBService.clean() #@UndefinedVariable
+
@inlineCallbacks
def test_recordsMatchingTokens(self):
"""
@@ -836,7 +846,7 @@
self.assertEquals(records[0].shortNames[0], "apollo")
-
+
class GUIDTests(TestCase):
def setUp(self):
@@ -844,6 +854,7 @@
self.service.setRealm("test")
self.service.baseGUID = "0E8E6EC2-8E52-4FF3-8F62-6F398B08A498"
+
def test_normalizeUUID(self):
# Ensure that record.guid automatically gets normalized to
@@ -882,6 +893,8 @@
shortNames=("testing",))
self.assertEquals(expected, record.guid)
+
+
class DirectoryRecordTests(TestCase):
"""
Test L{DirectoryRecord} apis.
@@ -892,6 +905,7 @@
self.service.setRealm("test")
self.service.baseGUID = "0E8E6EC2-8E52-4FF3-8F62-6F398B08A498"
+
def test_cacheToken(self):
"""
Test that DirectoryRecord.cacheToken is different for different records, and its value changes
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2013-02-08 01:55:53 UTC (rev 10665)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2013-02-08 17:05:13 UTC (rev 10666)
@@ -19,7 +19,7 @@
from twistedcaldav.directory.directory import DirectoryService
from twistedcaldav.test.util import xmlFile, augmentsFile, proxiesFile
-from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource,\
+from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource, \
DirectoryPrincipalResource
from twistedcaldav.directory.xmlfile import XMLDirectoryService
@@ -59,14 +59,17 @@
yield XMLCalendarUserProxyLoader(proxiesFile.path).updateProxyDB()
+
def tearDown(self):
""" Empty the proxy db between tests """
- return calendaruserproxy.ProxyDBService.clean()
+ return calendaruserproxy.ProxyDBService.clean() #@UndefinedVariable
+
def _getPrincipalByShortName(self, type, name):
provisioningResource = self.principalRootResources[self.directoryService.__class__.__name__]
return provisioningResource.principalForShortName(type, name)
+
def _groupMembersTest(self, recordType, recordName, subPrincipalName, expectedMembers):
def gotMembers(members):
memberNames = set([p.displayName() for p in members])
@@ -80,6 +83,7 @@
d.addCallback(gotMembers)
return d
+
def _groupMembershipsTest(self, recordType, recordName, subPrincipalName, expectedMemberships):
def gotMemberships(memberships):
uids = set([p.principalUID() for p in memberships])
@@ -92,7 +96,8 @@
d = principal.groupMemberships()
d.addCallback(gotMemberships)
return d
-
+
+
@inlineCallbacks
def _addProxy(self, principal, subPrincipalName, proxyPrincipal):
@@ -104,9 +109,10 @@
if isinstance(proxyPrincipal, tuple):
proxyPrincipal = self._getPrincipalByShortName(proxyPrincipal[0], proxyPrincipal[1])
members.add(proxyPrincipal)
-
+
yield principal.setGroupMemberSetPrincipals(members)
+
@inlineCallbacks
def _removeProxy(self, recordType, recordName, subPrincipalName, proxyRecordType, proxyRecordName):
@@ -119,9 +125,10 @@
if p.principalUID() == proxyPrincipal.principalUID():
members.remove(p)
break
-
+
yield principal.setGroupMemberSetPrincipals(members)
+
@inlineCallbacks
def _clearProxy(self, principal, subPrincipalName):
@@ -130,6 +137,7 @@
principal = principal.getChild(subPrincipalName)
yield principal.setGroupMemberSetPrincipals(set())
+
@inlineCallbacks
def _proxyForTest(self, recordType, recordName, expectedProxies, read_write):
principal = self._getPrincipalByShortName(recordType, recordName)
@@ -137,6 +145,7 @@
proxies = sorted([principal.displayName() for principal in proxies])
self.assertEquals(proxies, sorted(expectedProxies))
+
@inlineCallbacks
def test_multipleProxyAssignmentsAtOnce(self):
yield self._proxyForTest(
@@ -150,6 +159,7 @@
True
)
+
def test_groupMembersRegular(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -159,6 +169,7 @@
("Chris Lecroy", "David Reid", "Wilfredo Sanchez", "West Coast", "East Coast", "Cyrus Daboo",),
)
+
def test_groupMembersRecursive(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -168,6 +179,7 @@
("Wilfredo Sanchez", "Recursive2 Coasts", "Cyrus Daboo",),
)
+
def test_groupMembersProxySingleUser(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -177,6 +189,7 @@
("Wilfredo Sanchez",),
)
+
def test_groupMembersProxySingleGroup(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -186,6 +199,7 @@
("Chris Lecroy", "David Reid", "Wilfredo Sanchez", "West Coast",),
)
+
def test_groupMembersProxySingleGroupWithNestedGroups(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -195,6 +209,7 @@
("Chris Lecroy", "David Reid", "Wilfredo Sanchez", "West Coast", "East Coast", "Cyrus Daboo", "Both Coasts",),
)
+
def test_groupMembersProxySingleGroupWithNestedRecursiveGroups(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -204,6 +219,7 @@
("Wilfredo Sanchez", "Cyrus Daboo", "Recursive1 Coasts", "Recursive2 Coasts",),
)
+
def test_groupMembersProxySingleGroupWithNonCalendarGroup(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -222,6 +238,7 @@
return DeferredList(ds)
+
def test_groupMembersProxyMissingUser(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -245,6 +262,7 @@
d.addCallback(check)
return d
+
def test_groupMembershipsMissingUser(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -269,6 +287,7 @@
d.addCallback(check)
return d
+
@inlineCallbacks
def test_setGroupMemberSet(self):
class StubMemberDB(object):
@@ -282,7 +301,6 @@
def getMembers(self, uid):
return succeed(self.members)
-
user = self._getPrincipalByShortName(self.directoryService.recordType_users,
"cdaboo")
@@ -305,6 +323,7 @@
set(["5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1",
"8B4288F6-CC82-491D-8EF9-642EF4F3E7D0"]))
+
@inlineCallbacks
def test_setGroupMemberSetNotifiesPrincipalCaches(self):
class StubCacheNotifier(object):
@@ -336,14 +355,16 @@
finally:
DirectoryPrincipalResource.cacheNotifierFactory = oldCacheNotifier
+
def test_proxyFor(self):
return self._proxyForTest(
- DirectoryService.recordType_users, "wsanchez",
- ("Mercury Seven", "Gemini Twelve", "Apollo Eleven", "Orion", ),
+ DirectoryService.recordType_users, "wsanchez",
+ ("Mercury Seven", "Gemini Twelve", "Apollo Eleven", "Orion",),
True
)
+
@inlineCallbacks
def test_proxyForDuplicates(self):
@@ -354,22 +375,24 @@
)
yield self._proxyForTest(
- DirectoryService.recordType_users, "wsanchez",
- ("Mercury Seven", "Gemini Twelve", "Apollo Eleven", "Orion", ),
+ DirectoryService.recordType_users, "wsanchez",
+ ("Mercury Seven", "Gemini Twelve", "Apollo Eleven", "Orion",),
True
)
+
def test_readOnlyProxyFor(self):
return self._proxyForTest(
- DirectoryService.recordType_users, "wsanchez",
- ("Non-calendar proxy", ),
+ DirectoryService.recordType_users, "wsanchez",
+ ("Non-calendar proxy",),
False
)
+
@inlineCallbacks
def test_UserProxy(self):
-
+
for proxyType in ("calendar-proxy-read", "calendar-proxy-write"):
yield self._addProxy(
@@ -377,31 +400,31 @@
proxyType,
(DirectoryService.recordType_users, "cdaboo",),
)
-
+
yield self._groupMembersTest(
DirectoryService.recordType_users, "wsanchez",
proxyType,
("Cyrus Daboo",),
)
-
+
yield self._addProxy(
(DirectoryService.recordType_users, "wsanchez",),
proxyType,
(DirectoryService.recordType_users, "lecroy",),
)
-
+
yield self._groupMembersTest(
DirectoryService.recordType_users, "wsanchez",
proxyType,
("Cyrus Daboo", "Chris Lecroy",),
)
-
+
yield self._removeProxy(
DirectoryService.recordType_users, "wsanchez",
proxyType,
DirectoryService.recordType_users, "cdaboo",
)
-
+
yield self._groupMembersTest(
DirectoryService.recordType_users, "wsanchez",
proxyType,
@@ -421,7 +444,7 @@
record = self.directoryService.recordWithGUID("320B73A1-46E2-4180-9563-782DFDBE1F63")
provisioningResource = self.principalRootResources[self.directoryService.__class__.__name__]
- principal = provisioningResource.principalForRecord(record)
+ principal = provisioningResource.principalForRecord(record)
proxyPrincipal = provisioningResource.principalForShortName(recordType,
"wsanchez")
@@ -438,7 +461,7 @@
delegated-to directly
"""
self.assertEquals(
- set((yield calendaruserproxy.ProxyDBService.getAllMembers())),
+ set((yield calendaruserproxy.ProxyDBService.getAllMembers())), #@UndefinedVariable
set([u'6423F94A-6B76-4A3A-815B-D52CFD77935D', u'8A985493-EE2C-4665-94CF-4DFEA3A89500', u'9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2', u'both_coasts', u'left_coast', u'non_calendar_group', u'recursive1_coasts', u'recursive2_coasts', u'EC465590-E9E9-4746-ACE8-6C756A49FE4D'])
)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130208/ce52e71a/attachment-0001.html>
More information about the calendarserver-changes
mailing list