[CalendarServer-changes] [5057] CalendarServer/branches/users/sagen/locations-resources-2/ calendarserver/tools

[source_changes at macosforge.org]

Revision: 5057
          http://trac.macosforge.org/projects/calendarserver/changeset/5057
Author:   sagen at apple.com
Date:     2010-02-08 13:00:27 -0800 (Mon, 08 Feb 2010)
Log Message:
-----------
Set up proxy db file for test_gateway

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/principals.py
    CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/test/gateway/caldavd.plist
    CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/test/test_gateway.py

Modified: CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/principals.py	2010-02-08 20:28:32 UTC (rev 5056)
+++ CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/principals.py	2010-02-08 21:00:27 UTC (rev 5057)
@@ -334,7 +334,7 @@
         if checkOnly:
             return None
 
-        return directory.principalCollection.principalForUID(guid)
+        return directory.principalCollection.principalForUID(str(guid))
     except ValueError:
         pass
 

Modified: CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/test/gateway/caldavd.plist
===================================================================
--- CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/test/gateway/caldavd.plist	2010-02-08 20:28:32 UTC (rev 5056)
+++ CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/test/gateway/caldavd.plist	2010-02-08 21:00:27 UTC (rev 5057)
@@ -243,7 +243,7 @@
       <key>params</key>
       <dict>
         <key>dbpath</key>
-        <string>data/proxies.sqlite</string>
+        <string>%(ProxyDBFile)s</string>
       </dict>
     </dict>
 

Modified: CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/test/test_gateway.py
===================================================================
--- CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/test/test_gateway.py	2010-02-08 20:28:32 UTC (rev 5056)
+++ CalendarServer/branches/users/sagen/locations-resources-2/calendarserver/tools/test/test_gateway.py	2010-02-08 21:00:27 UTC (rev 5057)
@@ -131,12 +131,15 @@
         copyAugmentFile = tmpDir.child("augments.xml")
         origAugmentFile.copyTo(copyAugmentFile)
 
+        proxyFile = tmpDir.child("proxies.sqlite")
+
         newConfig = template % {
             'DataRoot' : dataRoot.path,
             'DocumentRoot' : docRoot.path,
             'DirectoryXMLFile' : copyUsersFile.path,
             'ResourceXMLFile' : copyResourcesFile.path,
             'AugmentXMLFile' : copyAugmentFile.path,
+            'ProxyDBFile' : proxyFile.path,
         }
         configFilePath = tmpDir.child("caldavd.plist")
         configFilePath.setContent(newConfig)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100208/9367998b/attachment.html>