aboutsummaryrefslogtreecommitdiffstats
path: root/test/server_poll.py
diff options
context:
space:
mode:
authorzhaohu xing <32668889+920232796@users.noreply.github.com>2022-11-30 02:13:17 +0000
committerGitHub <noreply@github.com>2022-11-30 02:13:17 +0000
commit0831ab476c626eb796b609acf8771177692bfab7 (patch)
treeebae98ea40ecc5b34497424bee19310e9fac4068 /test/server_poll.py
parentee3f5ea3eeb31f1ed72e2f0cbed2c00a782497d8 (diff)
parent4b3c5bc24bffdf429c463a465763b3077fe55eb8 (diff)
downloadstable-diffusion-webui-gfx803-0831ab476c626eb796b609acf8771177692bfab7.tar.gz
stable-diffusion-webui-gfx803-0831ab476c626eb796b609acf8771177692bfab7.tar.bz2
stable-diffusion-webui-gfx803-0831ab476c626eb796b609acf8771177692bfab7.zip
Merge branch 'master' into master
Diffstat (limited to 'test/server_poll.py')
-rw-r--r--test/server_poll.py13
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