[CalendarServer-changes] [12929] CalendarServer/branches/users/sagen/move2who-4

[source_changes at macosforge.org]

Revision: 12929
          http://trac.calendarserver.org//changeset/12929
Author:   sagen at apple.com
Date:     2014-03-17 11:23:58 -0700 (Mon, 17 Mar 2014)
Log Message:
-----------
Remove obsolete aggregate directory test; add setDirectoryService() to file common data store

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/tap/test/test_caldav.py
    CalendarServer/branches/users/sagen/move2who-4/txdav/common/datastore/file.py

Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tap/test/test_caldav.py	2014-03-17 18:10:56 UTC (rev 12928)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tap/test/test_caldav.py	2014-03-17 18:23:58 UTC (rev 12929)
@@ -42,7 +42,7 @@
 
 from twext.python.log import Logger
 from twext.python.filepath import CachingFilePath as FilePath
-from plistlib import writePlist #@UnresolvedImport
+from plistlib import writePlist  # @UnresolvedImport
 from txweb2.dav import auth
 from txweb2.log import LogWrapperResource
 from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer
@@ -50,7 +50,6 @@
 from twistedcaldav.config import config, ConfigDict, ConfigurationError
 from twistedcaldav.stdconfig import DEFAULT_CONFIG
 
-from twistedcaldav.directory.aggregate import AggregateDirectoryService
 from twistedcaldav.directory.calendar import DirectoryCalendarHomeProvisioningResource
 from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource
 
@@ -912,18 +911,6 @@
         self.assertEquals(principals.directory, calendars.directory)
 
 
-    def test_aggregateDirectory(self):
-        """
-        Assert that the base directory service is actually
-        an AggregateDirectoryService
-        """
-        site = self.getSite()
-        principals = site.resource.resource.resource.getChild("principals")
-        directory = principals.directory
-
-        self.failUnless(isinstance(directory, AggregateDirectoryService))
-
-
     def test_configuredDirectoryService(self):
         """
         Test that the real directory service is the directory service

Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/common/datastore/file.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/common/datastore/file.py	2014-03-17 18:10:56 UTC (rev 12928)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/common/datastore/file.py	2014-03-17 18:23:58 UTC (rev 12929)
@@ -148,6 +148,10 @@
         return self._directoryService
 
 
+    def setDirectoryService(self, directoryService):
+        self._directoryService = directoryService
+
+
     def callWithNewTransactions(self, callback):
         """
         Registers a method to be called whenever a new transaction is
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140317/f291049b/attachment-0001.html>