[CalendarServer-changes] [3011] CalendarServer/branches/users/sagen/principal-property-search-2995/ twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 3011
          http://trac.macosforge.org/projects/calendarserver/changeset/3011
Author:   sagen at apple.com
Date:     2008-09-17 15:19:06 -0700 (Wed, 17 Sep 2008)
Log Message:
-----------
Fix tests

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/principal.py
    CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/sqldb.py
    CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/test/test_opendirectory.py

Modified: CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/principal.py	2008-09-17 21:18:56 UTC (rev 3010)
+++ CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/principal.py	2008-09-17 22:19:06 UTC (rev 3011)
@@ -138,6 +138,10 @@
     }
 
     def propertyToField(self, property):
+        """
+        If property is a DAV property that maps to a directory field, return
+        that field's name, otherwise return None
+        """
         return self._fieldMap.get(repr(property), None)
 
 

Modified: CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/sqldb.py
===================================================================
--- CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/sqldb.py	2008-09-17 21:18:56 UTC (rev 3010)
+++ CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/sqldb.py	2008-09-17 22:19:06 UTC (rev 3011)
@@ -350,6 +350,9 @@
             guid                  = guid,
             shortName             = shortName,
             fullName              = name,
+            firstName             = None,
+            lastName              = None,
+            emailAddress          = None,
             calendarUserAddresses = calendarUserAddresses,
             autoSchedule          = autoSchedule,
         )

Modified: CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/test/test_opendirectory.py	2008-09-17 21:18:56 UTC (rev 3010)
+++ CalendarServer/branches/users/sagen/principal-property-search-2995/twistedcaldav/directory/test/test_opendirectory.py	2008-09-17 22:19:06 UTC (rev 3011)
@@ -67,6 +67,9 @@
                 nodeName              = "/LDAPv2/127.0.0.1",
                 shortName             = "user",
                 fullName              = "Some user",
+                firstName             = "Some",
+                lastName              = "User",
+                emailAddress          = "someuser at example.com",
                 calendarUserAddresses = set(("mailtoguid at example.com",)),
                 autoSchedule          = False,
                 enabledForCalendaring = True,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080917/aa2411c5/attachment.html