Tests cleaned up

This commit is contained in:
Vladimir Repin 2022-11-12 15:12:15 +03:00
parent 98947d173e
commit 007f4f7314
5 changed files with 20 additions and 14 deletions

View file

@ -229,6 +229,9 @@ def prepare_enviroment():
def tests(argv): def tests(argv):
if "--api" not in argv: if "--api" not in argv:
argv.append("--api") argv.append("--api")
if "--ckpt" not in argv:
argv.append("--ckpt")
argv.append("./test/test_files/empty.pt")
print(f"Launching Web UI in another process for testing with arguments: {' '.join(argv[1:])}") print(f"Launching Web UI in another process for testing with arguments: {' '.join(argv[1:])}")
@ -236,7 +239,7 @@ def tests(argv):
proc = subprocess.Popen([sys.executable, *argv], stdout=stdout, stderr=stderr) proc = subprocess.Popen([sys.executable, *argv], stdout=stdout, stderr=stderr)
import test.server_poll import test.server_poll
test.server_poll.run_tests() test.server_poll.run_tests(proc)
print(f"Stopping Web UI process with id {proc.pid}") print(f"Stopping Web UI process with id {proc.pid}")
proc.kill() proc.kill()

View file

@ -3,7 +3,7 @@ import requests
import time import time
def run_tests(): def run_tests(proc):
timeout_threshold = 240 timeout_threshold = 240
start_time = time.time() start_time = time.time()
while time.time()-start_time < timeout_threshold: while time.time()-start_time < timeout_threshold:
@ -11,8 +11,9 @@ def run_tests():
requests.head("http://localhost:7860/") requests.head("http://localhost:7860/")
break break
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
pass if proc.poll() is not None:
if time.time()-start_time < timeout_threshold: break
if proc.poll() is None:
suite = unittest.TestLoader().discover('', pattern='*_test.py') suite = unittest.TestLoader().discover('', pattern='*_test.py')
result = unittest.TextTestRunner(verbosity=2).run(suite) result = unittest.TextTestRunner(verbosity=2).run(suite)
else: else:

BIN
test/test_files/empty.pt Normal file

Binary file not shown.

View file

@ -53,13 +53,15 @@ class TestTxt2ImgWorking(unittest.TestCase):
self.simple_txt2img["restore_faces"] = True self.simple_txt2img["restore_faces"] = True
self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
def test_txt2img_with_tiling_faces_performed(self): def test_txt2img_with_tiling_performed(self):
self.simple_txt2img["tiling"] = True self.simple_txt2img["tiling"] = True
self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
def test_txt2img_with_vanilla_sampler_performed(self): def test_txt2img_with_vanilla_sampler_performed(self):
self.simple_txt2img["sampler_index"] = "PLMS" self.simple_txt2img["sampler_index"] = "PLMS"
self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
self.simple_txt2img["sampler_index"] = "DDIM"
self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
def test_txt2img_multiple_batches_performed(self): def test_txt2img_multiple_batches_performed(self):
self.simple_txt2img["n_iter"] = 2 self.simple_txt2img["n_iter"] = 2

View file

@ -18,19 +18,19 @@ class UtilsTests(unittest.TestCase):
def test_options_get(self): def test_options_get(self):
self.assertEqual(requests.get(self.url_options).status_code, 200) self.assertEqual(requests.get(self.url_options).status_code, 200)
def test_options_write(self): # def test_options_write(self):
response = requests.get(self.url_options) # response = requests.get(self.url_options)
self.assertEqual(response.status_code, 200) # self.assertEqual(response.status_code, 200)
pre_value = response.json()["send_seed"] # pre_value = response.json()["send_seed"]
self.assertEqual(requests.post(self.url_options, json={"send_seed":not pre_value}).status_code, 200) # self.assertEqual(requests.post(self.url_options, json={"send_seed":not pre_value}).status_code, 200)
response = requests.get(self.url_options) # response = requests.get(self.url_options)
self.assertEqual(response.status_code, 200) # self.assertEqual(response.status_code, 200)
self.assertEqual(response.json()["send_seed"], not pre_value) # self.assertEqual(response.json()["send_seed"], not pre_value)
requests.post(self.url_options, json={"send_seed": pre_value}) # requests.post(self.url_options, json={"send_seed": pre_value})
def test_cmd_flags(self): def test_cmd_flags(self):
self.assertEqual(requests.get(self.url_cmd_flags).status_code, 200) self.assertEqual(requests.get(self.url_cmd_flags).status_code, 200)