[CalendarServer-changes] [4326] CalendarServer/trunk/twistedcaldav/test

[source_changes at macosforge.org]

Revision: 4326
          http://trac.macosforge.org/projects/calendarserver/changeset/4326
Author:   sagen at apple.com
Date:     2009-06-04 12:20:49 -0700 (Thu, 04 Jun 2009)
Log Message:
-----------
Clean up un-fired DelayedCalls at tearDown( ), and don't change the DelayedCall class' debug attribute in the middle of testing -- that causes some twisted code to raise an exception.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/test/test_cache.py
    CalendarServer/trunk/twistedcaldav/test/util.py

Modified: CalendarServer/trunk/twistedcaldav/test/test_cache.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_cache.py	2009-06-04 17:42:13 UTC (rev 4325)
+++ CalendarServer/trunk/twistedcaldav/test/test_cache.py	2009-06-04 19:20:49 UTC (rev 4326)
@@ -116,6 +116,8 @@
 
 
     def tearDown(self):
+        for call in self.memcache._timeouts.itervalues():
+            call.cancel()
         MemcacheChangeNotifier._memcacheProtocol = None
 
 
@@ -361,6 +363,10 @@
 
         self.memcacheStub = memcacheStub
 
+    def tearDown(self):
+        for call in self.memcacheStub._timeouts.itervalues():
+            call.cancel()
+
     def test_givenURIsForKeys(self):
         expected_response = (200, Headers({}), "Foobarbaz")
 

Modified: CalendarServer/trunk/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/util.py	2009-06-04 17:42:13 UTC (rev 4325)
+++ CalendarServer/trunk/twistedcaldav/test/util.py	2009-06-04 19:20:49 UTC (rev 4326)
@@ -29,6 +29,8 @@
 
 import twisted.web2.dav.test.util
 
+from twisted.internet.base import DelayedCall
+DelayedCall.debug = True
 
 class TestCase(twisted.web2.dav.test.util.TestCase):
     resource_class = CalDAVFile
@@ -208,8 +210,6 @@
             if key in self._timeouts:
                 self._timeouts[key].cancel()
 
-            from twisted.internet.base import DelayedCall
-            DelayedCall.debug = True
 
             self._timeouts[key] = self._reactor.callLater(
                 expireTime,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090604/818d87de/attachment-0001.html>