[Tests] Fix json_api AlreadyCancelled watchdog error

This commit is contained in:
Calum Lind 2016-05-08 10:36:44 +01:00
commit d5294d5733

View file

@ -28,7 +28,7 @@ def set_tmp_config_dir():
def add_watchdog(deferred, timeout=0.05, message=None): def add_watchdog(deferred, timeout=0.05, message=None):
def callback(value): def callback(value):
if not watchdog.called: if not watchdog.called and not watchdog.cancelled:
watchdog.cancel() watchdog.cancel()
if not deferred.called: if not deferred.called:
if message: if message: