[CalendarServer-changes] [671] CalendarServer/trunk/twistedcaldav/directory/test

[source_changes at macosforge.org]

Revision: 671
          http://trac.macosforge.org/projects/calendarserver/changeset/671
Author:   wsanchez at apple.com
Date:     2006-12-04 23:35:49 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Add more metadata to tests.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/test/test_apache.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
    CalendarServer/trunk/twistedcaldav/directory/test/util.py

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_apache.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_apache.py	2006-12-05 06:46:35 UTC (rev 670)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_apache.py	2006-12-05 07:35:49 UTC (rev 671)
@@ -35,19 +35,22 @@
     recordTypes = set(("user", "group"))
 
     users = {
-        "wsanchez": "foo",
-        "cdaboo"  : "bar",
-        "dreid"   : "baz",
-        "lecroy"  : "quux",
+        "wsanchez": { "password": "foo",  "guid": None, "addresses": () },
+        "cdaboo"  : { "password": "bar",  "guid": None, "addresses": () },
+        "dreid"   : { "password": "baz",  "guid": None, "addresses": () },
+        "lecroy"  : { "password": "quux", "guid": None, "addresses": () },
     }
 
     groups = {
-        "managers"   : ("lecroy",),
-        "grunts"     : ("wsanchez", "cdaboo", "dreid"),
-        "right_coast": ("cdaboo",),
-        "left_coast" : ("wsanchez", "dreid", "lecroy"),
+        "managers"   : { "members": ("lecroy",),                     "guid": None, "addresses": () },
+        "grunts"     : { "members": ("wsanchez", "cdaboo", "dreid"), "guid": None, "addresses": () },
+        "right_coast": { "members": ("cdaboo",),                     "guid": None, "addresses": () },
+        "left_coast" : { "members": ("wsanchez", "dreid", "lecroy"), "guid": None, "addresses": () },
     }
 
+    resources = {
+    }
+
     def service(self):
         return self.serviceClass(self.userFile(), self.groupFile())
 

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py	2006-12-05 06:46:35 UTC (rev 670)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py	2006-12-05 07:35:49 UTC (rev 671)
@@ -31,28 +31,28 @@
     recordTypes = set(("user", "group", "resource"))
 
     users = {
-        "admin"   : "nimda",
-        "proxy"   : "yxorp",
-        "wsanchez": "zehcnasw",
-        "cdaboo"  : "oobadc",
-        "lecroy"  : "yorcel",
-        "dreid"   : "dierd",
-        "user01"  : "01user",
-        "user02"  : "02user",
+        "admin"   : { "password": "nimda",    "guid": None, "addresses": () },
+        "proxy"   : { "password": "yxorp",    "guid": None, "addresses": () },
+        "wsanchez": { "password": "zehcnasw", "guid": None, "addresses": () },
+        "cdaboo"  : { "password": "oobadc",   "guid": None, "addresses": () },
+        "lecroy"  : { "password": "yorcel",   "guid": None, "addresses": () },
+        "dreid"   : { "password": "dierd",    "guid": None, "addresses": () },
+        "user01"  : { "password": "01user",   "guid": None, "addresses": () },
+        "user02"  : { "password": "02user",   "guid": None, "addresses": () },
     }
 
     groups = {
-        "managers"   : ("lecroy",),
-        "grunts"     : ("wsanchez", "cdaboo", "dreid"),
-        "right_coast": ("cdaboo",),
-        "left_coast" : ("wsanchez", "dreid", "lecroy"),
+        "managers"   : { "password": "managers",    "members": ("lecroy",),                     "guid": None, "addresses": () },
+        "grunts"     : { "password": "grunts",      "members": ("wsanchez", "cdaboo", "dreid"), "guid": None, "addresses": () },
+        "right_coast": { "password": "right_coast", "members": ("cdaboo",),                     "guid": None, "addresses": () },
+        "left_coast" : { "password": "left_coast",  "members": ("wsanchez", "dreid", "lecroy"), "guid": None, "addresses": () },
     }
 
-    resources = set((
-        "mercury",
-        "gemini",
-        "apollo",
-    ))
+    resources = {
+        "mercury": { "password": "mercury", "guid": None, "addresses": () },
+        "gemini" : { "password": "gemini",  "guid": None, "addresses": () },
+        "apollo" : { "password": "apollo",  "guid": None, "addresses": () },
+    }
 
     def xmlFile(self):
         if not hasattr(self, "_xmlFile"):

Modified: CalendarServer/trunk/twistedcaldav/directory/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/util.py	2006-12-05 06:46:35 UTC (rev 670)
+++ CalendarServer/trunk/twistedcaldav/directory/test/util.py	2006-12-05 07:35:49 UTC (rev 671)
@@ -81,7 +81,7 @@
         if not self.resources:
             raise SkipTest("No resources")
 
-        self.assertEquals(self.recordNames("resource"), self.resources)
+        self.assertEquals(self.recordNames("resource"), set(self.resources.keys()))
 
     def test_recordWithShortName_user(self):
         """
@@ -133,7 +133,7 @@
             groupRecord = service.recordWithShortName("group", group)
             self.assertEquals(
                 set(m.shortName for m in groupRecord.members()),
-                set(self.groups[group])
+                set(self.groups[group]["members"])
             )
 
     def test_groupMemberships(self):
@@ -150,7 +150,7 @@
             userRecord = service.recordWithShortName("user", user)
             self.assertEquals(
                 set(g.shortName for g in userRecord.groups()),
-                set(g for g in self.groups if user in self.groups[g])
+                set(g for g in self.groups if user in self.groups[g]["members"])
             )
 
     def recordNames(self, recordType):
@@ -170,7 +170,7 @@
         service = self.service()
         for user in self.users:
             userRecord = service.recordWithShortName("user", user)
-            self.failUnless(userRecord.verifyCredentials(UsernamePassword(user, self.users[user])))
+            self.failUnless(userRecord.verifyCredentials(UsernamePassword(user, self.users[user]["password"])))
 
 # authRequest = {
 #    username="username",
@@ -206,7 +206,7 @@
                     "md5",
                     user,
                     service.realmName,
-                    userRecord.password,
+                    self.users[user]["password"],
                     "booger",
                     "phlegm",
                 ),

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