[CalendarServer-changes] [6580] CalendarServer/trunk/calendarserver/tap/util.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Nov 9 10:46:12 PST 2010


Revision: 6580
          http://trac.macosforge.org/projects/calendarserver/changeset/6580
Author:   sagen at apple.com
Date:     2010-11-09 10:46:08 -0800 (Tue, 09 Nov 2010)
Log Message:
-----------
Make sure directoryFromConfig initializes the augment service (otherwise certain unit tests will fail randomly)

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/util.py

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2010-11-09 16:36:32 UTC (rev 6579)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2010-11-09 18:46:08 UTC (rev 6580)
@@ -169,6 +169,19 @@
     """
 
     #
+    # Setup the Augment Service
+    #
+    augmentClass = namedClass(config.AugmentService.type)
+
+    log.info("Configuring augment service of type: %s" % (augmentClass,))
+
+    try:
+        augment.AugmentService = augmentClass(**config.AugmentService.params)
+    except IOError:
+        log.error("Could not start augment service")
+        raise
+
+    #
     # Setup the Directory
     #
     directories = []
@@ -281,20 +294,6 @@
     addressBookResourceClass     = DirectoryAddressBookHomeProvisioningResource
     directoryBackedAddressBookResourceClass = DirectoryBackedAddressBookResource
 
-    #
-    # Setup the Augment Service
-    #
-    augmentClass = namedClass(config.AugmentService.type)
-
-    log.info("Configuring augment service of type: %s" % (augmentClass,))
-
-    try:
-        augment.AugmentService = augmentClass(**config.AugmentService.params)
-    except IOError:
-        log.error("Could not start augment service")
-        raise
-
-
     directory = directoryFromConfig(config)
 
     #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101109/54f786f5/attachment.html>


More information about the calendarserver-changes mailing list