[Tests] Fix json_api AlreadyCancelled watchdog error

2016-05-08 10:36:44 +01:00 · 2016-05-08 10:36:44 +01:00 · d5294d5733
parent 3769d99532
commit d5294d5733
1 changed files with 1 additions and 1 deletions
--- a/deluge/tests/common.py
+++ b/deluge/tests/common.py
@ -28,7 +28,7 @@ def set_tmp_config_dir():
 def add_watchdog(deferred, timeout=0.05, message=None):

    def callback(value):
-        if not watchdog.called:
+        if not watchdog.called and not watchdog.cancelled:
            watchdog.cancel()
        if not deferred.called:
            if message: