[CalendarServer-changes] [961] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 961
          http://trac.macosforge.org/projects/calendarserver/changeset/961
Author:   cdaboo at apple.com
Date:     2007-01-08 09:15:57 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
Added location record type to SQLDB implementation. Fixed tests for location support.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
    CalendarServer/trunk/twistedcaldav/directory/sqldb.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_sqldb.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
    CalendarServer/trunk/twistedcaldav/directory/test/util.py

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-01-08 17:03:26 UTC (rev 960)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-01-08 17:15:57 UTC (rev 961)
@@ -78,7 +78,7 @@
         return h
 
     def recordTypes(self):
-        return ("user", "group", "resource", "location",)
+        return ("user", "group", "location", "resource")
 
     def _cacheRecords(self, recordType):
         if recordType not in self._records:

Modified: CalendarServer/trunk/twistedcaldav/directory/sqldb.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/sqldb.py	2007-01-08 17:03:26 UTC (rev 960)
+++ CalendarServer/trunk/twistedcaldav/directory/sqldb.py	2007-01-08 17:15:57 UTC (rev 961)
@@ -277,7 +277,7 @@
         self.realmName = self.manager.getRealm()
 
     def recordTypes(self):
-        recordTypes = ("user", "group", "resource")
+        recordTypes = ("user", "group", "location", "resource")
         return recordTypes
 
     def listRecords(self, recordType):

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2007-01-08 17:03:26 UTC (rev 960)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2007-01-08 17:15:57 UTC (rev 961)
@@ -38,7 +38,7 @@
         """
         Test Open Directory directory implementation.
         """
-        recordTypes = set(("user", "group", "resource"))
+        recordTypes = set(("user", "group", "location", "resource"))
 
         users = groups = locations = resources = {}
 

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_sqldb.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_sqldb.py	2007-01-08 17:03:26 UTC (rev 960)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_sqldb.py	2007-01-08 17:15:57 UTC (rev 961)
@@ -41,7 +41,6 @@
 
     def test_recordTypes(self):
         super(SQLDB, self).test_recordTypes()
-    test_recordTypes.todo = "Add locations record type"
 
     def test_verifyCredentials_digest(self):
         super(SQLDB, self).test_verifyCredentials_digest()

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py	2007-01-08 17:03:26 UTC (rev 960)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py	2007-01-08 17:15:57 UTC (rev 961)
@@ -94,6 +94,7 @@
         for recordType, expectedRecords in (
             ( "user"     , ("admin",) ),
             ( "group"    , ()         ),
+            ( "location" , ()         ),
             ( "resource" , ()         ),
         ):
             self.assertEquals(

Modified: CalendarServer/trunk/twistedcaldav/directory/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/util.py	2007-01-08 17:03:26 UTC (rev 960)
+++ CalendarServer/trunk/twistedcaldav/directory/test/util.py	2007-01-08 17:15:57 UTC (rev 961)
@@ -212,6 +212,7 @@
         for data, recordType in (
             (self.users,     "user"    ),
             (self.groups,    "group"   ),
+            (self.locations, "location"),
             (self.resources, "resource"),
         ):
             for item in data.iteritems():

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