[CalendarServer-changes] [12930] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tap/ test/test_caldav.py

[source_changes at macosforge.org]

Revision: 12930
          http://trac.calendarserver.org//changeset/12930
Author:   sagen at apple.com
Date:     2014-03-17 12:15:45 -0700 (Mon, 17 Mar 2014)
Log Message:
-----------
Removed obsolete directory test which is now tested elsewhere

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/tap/test/test_caldav.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:23:58 UTC (rev 12929)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tap/test/test_caldav.py	2014-03-17 19:15:45 UTC (rev 12930)
@@ -28,7 +28,6 @@
 from twisted.python.threadable import isInIOThread
 from twisted.internet.reactor import callFromThread
 from twisted.python.usage import Options, UsageError
-from twisted.python.reflect import namedAny
 from twisted.python.procutils import which
 
 from twisted.internet.interfaces import IProcessTransport, IReactorProcess
@@ -551,7 +550,7 @@
         store.queuer.callWithNewProposals(something)
         def patch(maker):
             def storageServiceStandIn(createMainService, logObserver,
-                                      uid=None, gid=None):
+                                      uid=None, gid=None, directory=None):
                 pool = None
                 logObserver = None
                 storageService = None
@@ -911,23 +910,7 @@
         self.assertEquals(principals.directory, calendars.directory)
 
 
-    def test_configuredDirectoryService(self):
-        """
-        Test that the real directory service is the directory service
-        set in the configuration file.
-        """
-        site = self.getSite()
-        principals = site.resource.resource.resource.getChild("principals")
-        directory = principals.directory
 
-        realDirectory = directory.serviceForRecordType("users")
-
-        configuredDirectory = namedAny(self.config.DirectoryService.type)
-
-        self.failUnless(isinstance(realDirectory, configuredDirectory))
-
-
-
 class DummyProcessObject(object):
     """
     Simple stub for Process Object API which just has an executable and some
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140317/9c6b4000/attachment.html>