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

source_changes at macosforge.org source_changes at macosforge.org
Tue Jun 29 09:52:02 PDT 2010


Revision: 5813
          http://trac.macosforge.org/projects/calendarserver/changeset/5813
Author:   sagen at apple.com
Date:     2010-06-29 09:51:57 -0700 (Tue, 29 Jun 2010)
Log Message:
-----------
Use twisted.trial patch() to restore config settings after tests.

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-28 22:34:37 UTC (rev 5812)
+++ CalendarServer/trunk/twistedcaldav/test/test_options.py	2010-06-29 16:51:57 UTC (rev 5813)
@@ -121,12 +121,7 @@
             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
+        self.patch(config, "EnableCalDAV", False)
         request = SimpleRequest(self.site, "OPTIONS", "/")
 
         return self.send(request, do_test)
@@ -143,12 +138,7 @@
             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
+        self.patch(config, "EnableCardDAV", False)
         request = SimpleRequest(self.site, "OPTIONS", "/")
 
         return self.send(request, do_test)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100629/1ff05bc3/attachment.html>


More information about the calendarserver-changes mailing list