[CalendarServer-changes] [5809] CalendarServer/trunk/twistedcaldav/test/test_options.py

[source_changes at macosforge.org]

Revision: 5809
          http://trac.macosforge.org/projects/calendarserver/changeset/5809
Author:   sagen at apple.com
Date:     2010-06-24 14:26:41 -0700 (Thu, 24 Jun 2010)
Log Message:
-----------
Make sure to restore config values

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/test/test_options.py

Modified: CalendarServer/trunk/twistedcaldav/test/test_options.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_options.py	2010-06-24 20:17:02 UTC (rev 5808)
+++ CalendarServer/trunk/twistedcaldav/test/test_options.py	2010-06-24 21:26:41 UTC (rev 5809)
@@ -121,6 +121,10 @@
             if not dav: self.fail("no DAV header: %s" % (response.headers,))
             self.assertIn("1", dav, "no DAV level 1 header")
             self.assertNotIn("calendar-access", dav, "DAV calendar-access header")
+        oldEnableCalDAV = config.EnableCalDAV
+        def _finally():
+            config.EnableCalDAV = oldEnableCalDAV
+        self.addCleanup(_finally)
 
         config.EnableCalDAV = False
         request = SimpleRequest(self.site, "OPTIONS", "/")
@@ -139,6 +143,11 @@
             self.assertIn("1", dav, "no DAV level 1 header")
             self.assertNotIn("addressbook", dav, "DAV addressbook header")
 
+        oldEnableCardDAV = config.EnableCardDAV
+        def _finally():
+            config.EnableCardDAV = oldEnableCardDAV
+        self.addCleanup(_finally)
+
         config.EnableCardDAV = False
         request = SimpleRequest(self.site, "OPTIONS", "/")
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100624/0cc5bd0b/attachment.html>