Don't use watchdog in unit tests

2019-09-05 13:43:59 +01:00 · 2019-09-05 13:43:59 +01:00 · 16a414fc53
parent 5d110d73e9
commit 16a414fc53
1 changed files with 8 additions and 4 deletions
--- a/daemon.py
+++ b/daemon.py
@ -3523,10 +3523,14 @@ def runDaemon(projectVersion, \
                              httpd.ocapAlways,maxReplies, \
                              domainMaxPostsPerDay,accountMaxPostsPerDay, \
                              allowDeletion,debug,httpd.acceptedCaps),daemon=True)
-    httpd.thrWatchdog= \
-        threadWithTrace(target=runInboxQueueWatchdog, \
-                        args=(projectVersion,httpd),daemon=True)        
-    httpd.thrWatchdog.start()
+    if not unitTest: 
+        httpd.thrWatchdog= \
+            threadWithTrace(target=runInboxQueueWatchdog, \
+                            args=(projectVersion,httpd),daemon=True)        
+        httpd.thrWatchdog.start()
+    else:
+        httpd.thrInboxQueue.start()
+
    if clientToServer:
        print('Running ActivityPub client on ' + domain + ' port ' + str(proxyPort))
    else: