fix cancelAfter and its tests

buildbot · Sep 29, 2013 · aa89b68 · aa89b68
1 parent a6ec211
commit aa89b68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/master/buildbot/test/unit/test_util_misc.py b/master/buildbot/test/unit/test_util_misc.py
@@ -153,18 +153,18 @@ def test_fails(self):
 
     def test_timeout_succeeds(self):
         c = task.Clock()
-        d = misc.cancelAfter(10, self.d)
+        d = misc.cancelAfter(10, self.d, _reactor=c)
         self.assertFalse(d.called)
-        c.advance(10)
+        c.advance(11)
         d.callback("result")  # ignored
         self.assertTrue(d.called)
         self.assertFailure(d, defer.CancelledError)
 
     def test_timeout_fails(self):
         c = task.Clock()
-        d = misc.cancelAfter(10, self.d)
+        d = misc.cancelAfter(10, self.d, _reactor=c)
         self.assertFalse(d.called)
-        c.advance(10)
+        c.advance(11)
         self.d.errback(RuntimeError("oh noes"))  # ignored
         self.assertTrue(d.called)
         self.assertFailure(d, defer.CancelledError)

diff --git a/master/buildbot/util/misc.py b/master/buildbot/util/misc.py
@@ -73,7 +73,8 @@ def cancelAfter(seconds, deferred, _reactor=reactor):
     # cancel the delayedCall when the underlying deferred fires
     @deferred.addBoth
     def cancelTimer(x):
-        delayedCall.cancel()
+        if delayedCall.active():
+            delayedCall.cancel()
         return x
 
     return deferred