From d5294d5733a3433e806e43751d0fb880f1c557be Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sun, 8 May 2016 10:36:44 +0100
Subject: [PATCH] [Tests] Fix json_api AlreadyCancelled watchdog error

---
 deluge/tests/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deluge/tests/common.py b/deluge/tests/common.py
index cc0accef4..812a03b74 100644
--- 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: