[CalendarServer-changes] [985] CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory /test

source_changes at macosforge.org source_changes at macosforge.org
Mon Jan 8 17:18:38 PST 2007


Revision: 985
          http://trac.macosforge.org/projects/calendarserver/changeset/985
Author:   dreid at apple.com
Date:     2007-01-08 17:18:38 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
fix tests

Modified Paths:
--------------
    CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/accounts.xml
    CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/test_sudo.py
    CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/test_xmlfile.py

Modified: CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/accounts.xml
===================================================================
--- CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/accounts.xml	2007-01-09 00:58:52 UTC (rev 984)
+++ CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/accounts.xml	2007-01-09 01:18:38 UTC (rev 985)
@@ -25,12 +25,6 @@
     <name>Administrators</name>
   </user>
   <user>
-    <uid>proxy</uid>
-    <password>yxorp</password>
-    <name>User who can authorize as someone else</name>
-    <canproxy/> <!-- FIXME: Is the directory the right place to configure this bit? -->
-  </user>
-  <user>
     <uid>wsanchez</uid>
     <password>zehcnasw</password>
     <name>Wilfredo Sanchez</name>

Modified: CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/test_sudo.py
===================================================================
--- CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/test_sudo.py	2007-01-09 00:58:52 UTC (rev 984)
+++ CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/test_sudo.py	2007-01-09 01:18:38 UTC (rev 985)
@@ -33,12 +33,14 @@
     Test the Sudo Directory Service
     """
 
-    recordTypes = set(('sudoer',))
-    recordType = 'sudoer'
+    recordTypes = set(('sudoers',))
+    recordType = 'sudoers'
 
     sudoers = {'alice': {'password': 'alice',},
              }
 
+    locations = {}
+
     def plistFile(self):
         if not hasattr(self, "_plistFile"):
             self._plistFile = FilePath(self.mktemp())
@@ -59,8 +61,8 @@
     def test_recordWithShortName(self):
         service = self.service()
 
-        record = service.recordWithShortName('sudoer', 'alice')
+        record = service.recordWithShortName(self.recordType, 'alice')
         self.assertEquals(record.password, 'alice')
 
-        record = service.recordWithShortName('sudoer', 'bob')
+        record = service.recordWithShortName(self.recordType, 'bob')
         self.failIf(record)

Modified: CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/test_xmlfile.py
===================================================================
--- CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/test_xmlfile.py	2007-01-09 00:58:52 UTC (rev 984)
+++ CalendarServer/branches/users/dreid/sudoers-3/twistedcaldav/directory/test/test_xmlfile.py	2007-01-09 01:18:38 UTC (rev 985)
@@ -38,7 +38,6 @@
 
     users = {
         "admin"   : { "password": "nimda",    "guid": None, "addresses": () },
-        "proxy"   : { "password": "yxorp",    "guid": None, "addresses": () },
         "wsanchez": { "password": "zehcnasw", "guid": None, "addresses": ("mailto:wsanchez at example.com",) },
         "cdaboo"  : { "password": "oobadc",   "guid": None, "addresses": ("mailto:cdaboo at example.com",)   },
         "lecroy"  : { "password": "yorcel",   "guid": None, "addresses": ("mailto:lecroy at example.com",)   },

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


More information about the calendarserver-changes mailing list