[CalendarServer-changes] [6285] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Sep 13 13:37:11 PDT 2010


Revision: 6285
          http://trac.macosforge.org/projects/calendarserver/changeset/6285
Author:   sagen at apple.com
Date:     2010-09-13 13:37:09 -0700 (Mon, 13 Sep 2010)
Log Message:
-----------
Assign augment service before directory service

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/provision/test/test_root.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_aggregate.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py

Modified: CalendarServer/trunk/calendarserver/provision/test/test_root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/test/test_root.py	2010-09-13 19:41:08 UTC (rev 6284)
+++ CalendarServer/trunk/calendarserver/provision/test/test_root.py	2010-09-13 20:37:09 UTC (rev 6285)
@@ -60,10 +60,10 @@
 
         RootResource.CheckSACL = FakeCheckSACL(sacls={"calendar": ["dreid"]})
 
-        directory = XMLDirectoryService({"xmlFile" : xmlFile})
         augment.AugmentService = augment.AugmentXMLDB(
             xmlFiles=(augmentsFile.path,)
         )
+        directory = XMLDirectoryService({"xmlFile" : xmlFile})
 
         principals = DirectoryPrincipalProvisioningResource(
             "/principals/",

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_aggregate.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_aggregate.py	2010-09-13 19:41:08 UTC (rev 6284)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_aggregate.py	2010-09-13 20:37:09 UTC (rev 6285)
@@ -62,10 +62,10 @@
         """
         Returns an IDirectoryService.
         """
+        augment.AugmentService = augment.AugmentXMLDB(xmlFiles=(augmentsFile.path,))
         xmlService = XMLDirectoryService({'xmlFile' : xmlFile})
         xmlService.recordTypePrefix = xml_prefix
 
-        augment.AugmentService = augment.AugmentXMLDB(xmlFiles=(augmentsFile.path,))
 
         return AggregateDirectoryService((xmlService,))
 

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2010-09-13 19:41:08 UTC (rev 6284)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2010-09-13 20:37:09 UTC (rev 6285)
@@ -51,8 +51,8 @@
 
         def setUp(self):
             super(OpenDirectory, self).setUp()
+            augment.AugmentService = augment.AugmentXMLDB(xmlFiles=())
             self._service = OpenDirectoryService({'node' : "/Search"}, dosetup=False)
-            augment.AugmentService = augment.AugmentXMLDB(xmlFiles=())
 
         def tearDown(self):
             for call in self._service._delayedCalls:
@@ -439,5 +439,5 @@
 
         def setUp(self):
             super(OpenDirectorySubset, self).setUp()
+            augment.AugmentService = augment.AugmentXMLDB(xmlFiles=())
             self._service = OpenDirectoryService({'node' : "/Search", 'recordTypes' : (DirectoryService.recordType_users, DirectoryService.recordType_groups)}, dosetup=False)
-            augment.AugmentService = augment.AugmentXMLDB(xmlFiles=())
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100913/0f518082/attachment.html>


More information about the calendarserver-changes mailing list