[CalendarServer-changes] [4435] CalendarServer/branches/config-separation
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jul 8 15:37:57 PDT 2009
Revision: 4435
http://trac.macosforge.org/projects/calendarserver/changeset/4435
Author: william_short at apple.com
Date: 2009-07-08 15:37:57 -0700 (Wed, 08 Jul 2009)
Log Message:
-----------
fix test failures
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 22:37:56 UTC (rev 4434)
+++ CalendarServer/branches/config-separation/calendarserver/tap/test/test_caldav.py 2009-07-08 22:37:57 UTC (rev 4435)
@@ -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 22:37:56 UTC (rev 4434)
+++ CalendarServer/branches/config-separation/twistedcaldav/test/test_config.py 2009-07-08 22:37:57 UTC (rev 4435)
@@ -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/ea50c28c/attachment-0001.html>
More information about the calendarserver-changes
mailing list