Merge branch 'master' into racecond_fix

1 files changed, 9 insertions, 4 deletions

diff --git a/test/server_poll.py b/test/server_poll.py
index eeefb7eb..d4df697b 100644
--- a/test/server_poll.py
+++ b/test/server_poll.py
@@ -3,7 +3,7 @@ import requests
 import time
 
 
-def run_tests():
+def run_tests(proc, test_dir):
     timeout_threshold = 240
     start_time = time.time()
     while time.time()-start_time < timeout_threshold:
@@ -11,9 +11,14 @@ def run_tests():
             requests.head("http://localhost:7860/")
             break
         except requests.exceptions.ConnectionError:
-            pass
-    if time.time()-start_time < timeout_threshold:
-        suite = unittest.TestLoader().discover('', pattern='*_test.py')
+            if proc.poll() is not None:
+                break
+    if proc.poll() is None:
+        if test_dir is None:
+            test_dir = ""
+        suite = unittest.TestLoader().discover(test_dir, pattern="*_test.py", top_level_dir="test")
         result = unittest.TextTestRunner(verbosity=2).run(suite)
+        return len(result.failures) + len(result.errors)
     else:
         print("Launch unsuccessful")
+        return 1