[CalendarServer-changes] [4438] CalendarServer/branches/config-separation

[source_changes at macosforge.org]

Revision: 4438
          http://trac.macosforge.org/projects/calendarserver/changeset/4438
Author:   william_short at apple.com
Date:     2009-07-08 16:34:52 -0700 (Wed, 08 Jul 2009)
Log Message:
-----------
fix teardowns

Modified Paths:
--------------
    CalendarServer/branches/config-separation/calendarserver/tap/test/test_caldav.py
    CalendarServer/branches/config-separation/twistedcaldav/test/test_config.py

Modified: CalendarServer/branches/config-separation/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/branches/config-separation/calendarserver/tap/test/test_caldav.py	2009-07-08 23:19:44 UTC (rev 4437)
+++ CalendarServer/branches/config-separation/calendarserver/tap/test/test_caldav.py	2009-07-08 23:34:52 UTC (rev 4438)
@@ -207,7 +207,7 @@
 
     def tearDown(self):
         config.setDefaults(DEFAULT_CONFIG)
-        config.reload()
+        config.reset()
 
     def writeConfig(self):
         """

Modified: CalendarServer/branches/config-separation/twistedcaldav/test/test_config.py
===================================================================
--- CalendarServer/branches/config-separation/twistedcaldav/test/test_config.py	2009-07-08 23:19:44 UTC (rev 4437)
+++ CalendarServer/branches/config-separation/twistedcaldav/test/test_config.py	2009-07-08 23:34:52 UTC (rev 4438)
@@ -57,8 +57,8 @@
         open(self.testConfig, "w").write(testConfig)
 
     def tearDown(self):
-        config.setProvider(ConfigProvider(DEFAULT_CONFIG))
-        config.load(None)
+        config.setDefaults(DEFAULT_CONFIG)
+        config.reset()
 
     def testDefaults(self):
         for key, value in DEFAULT_CONFIG.iteritems():
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090708/c676553c/attachment.html>