[CalendarServer-changes] [4599] CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav

[source_changes at macosforge.org]

Revision: 4599
          http://trac.macosforge.org/projects/calendarserver/changeset/4599
Author:   cdaboo at apple.com
Date:     2009-10-19 12:19:04 -0700 (Mon, 19 Oct 2009)
Log Message:
-----------
Fix some tests.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_calendar.py
    CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/test/test_cache.py

Modified: CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_calendar.py
===================================================================
--- CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_calendar.py	2009-10-19 19:15:43 UTC (rev 4598)
+++ CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_calendar.py	2009-10-19 19:19:04 UTC (rev 4599)
@@ -21,8 +21,9 @@
 from twisted.web2.test.test_server import SimpleRequest
 
 from twistedcaldav import caldavxml
+from twistedcaldav.directory import augment
 from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource
-from twistedcaldav.directory.test.test_xmlfile import xmlFile
+from twistedcaldav.directory.test.test_xmlfile import xmlFile, augmentsFile
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
 from twistedcaldav.static import CalendarHomeProvisioningFile
 
@@ -41,6 +42,7 @@
         fd.write(open(xmlFile.path, "r").read())
         fd.close()
         self.directoryService = XMLDirectoryService({'xmlFile' : self.xmlFile})
+        augment.AugmentService = augment.AugmentXMLDB(xmlFiles=(augmentsFile.path,))
         
         # Set up a principals hierarchy for each service we're testing with
         name = "principals"

Modified: CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/test/test_cache.py
===================================================================
--- CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/test/test_cache.py	2009-10-19 19:15:43 UTC (rev 4598)
+++ CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/test/test_cache.py	2009-10-19 19:19:04 UTC (rev 4599)
@@ -336,7 +336,7 @@
         self.tokens['/principals/__uids__/cdaboo/'] = 'principalToken0'
         self.tokens['/principals/__uids__/dreid/'] = 'principalTokenX'
 
-        def _getToken(uri):
+        def _getToken(uri, cachePoolHandle=None):
             return succeed(self.tokens.get(uri))
 
         self.rc._tokenForURI = _getToken
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091019/e36794ff/attachment.html>