[CalendarServer-changes] [1827] CalendarServer/branches/users/cdaboo/recursive-groups-1824/ twistedcaldav/directory/test

[source_changes at macosforge.org]

Revision: 1827
          http://trac.macosforge.org/projects/calendarserver/changeset/1827
Author:   cdaboo at apple.com
Date:     2007-08-27 14:28:14 -0700 (Mon, 27 Aug 2007)

Log Message:
-----------
Add a test for recursive proxy group.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/accounts.xml
    CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/test_proxyprincipalmembers.py
    CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/test_xmlfile.py

Modified: CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/accounts.xml
===================================================================
--- CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/accounts.xml	2007-08-25 21:25:06 UTC (rev 1826)
+++ CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/accounts.xml	2007-08-27 21:28:14 UTC (rev 1827)
@@ -157,6 +157,15 @@
       <member type="groups">both_coasts</member>
     </proxies>
   </location>
+  <location>
+    <uid>orion</uid>
+    <password>orion</password>
+    <name>Orion</name>
+    <cuaddr>mailto:orion at example.com</cuaddr>
+    <proxies>
+      <member type="groups">recursive1_coasts</member>
+    </proxies>
+  </location>
   <resource>
     <uid>transporter</uid>
     <password>transporter</password>

Modified: CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/test_proxyprincipalmembers.py
===================================================================
--- CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2007-08-25 21:25:06 UTC (rev 1826)
+++ CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2007-08-27 21:28:14 UTC (rev 1827)
@@ -92,6 +92,14 @@
         members = set([p.displayName() for p in members])
         self.assertEquals(members, set(('Chris Lecroy', 'David Reid', 'Wilfredo Sanchez', 'West Coast', 'East Coast', 'Cyrus Daboo', 'Both Coasts',)))
 
+    def test_groupMembersProxySingleGroupWithNestedRecursiveGroups(self):
+        """
+        DirectoryPrincipalResource.groupMembers()
+        """
+        members = self._getRecordByShortName(DirectoryService.recordType_locations, "orion").getChild("calendar-proxy-write").groupMembers()
+        members = set([p.displayName() for p in members])
+        self.assertEquals(members, set(('Wilfredo Sanchez', 'Cyrus Daboo', 'Recursive1 Coasts', 'Recursive2 Coasts',)))
+
     def _getRecordByShortName(self, type, name):
         """
         @return: an iterable of tuples

Modified: CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/test_xmlfile.py
===================================================================
--- CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/test_xmlfile.py	2007-08-25 21:25:06 UTC (rev 1826)
+++ CalendarServer/branches/users/cdaboo/recursive-groups-1824/twistedcaldav/directory/test/test_xmlfile.py	2007-08-27 21:28:14 UTC (rev 1827)
@@ -68,6 +68,7 @@
         "mercury": { "password": "mercury", "guid": None, "addresses": ("mailto:mercury at example.com",) },
         "gemini" : { "password": "gemini",  "guid": None, "addresses": ("mailto:gemini at example.com",)  },
         "apollo" : { "password": "apollo",  "guid": None, "addresses": ("mailto:apollo at example.com",)  },
+        "orion"  : { "password": "orion",   "guid": None, "addresses": ("mailto:orion at example.com",)  },
     }
 
     resources = {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070827/da51f803/attachment.html