Skip to content

Commit

Permalink
launch tests from launch.py with --tests commandline argument
Browse files Browse the repository at this point in the history
  • Loading branch information
AUTOMATIC1111 committed Oct 30, 2022
1 parent 05a657d commit 59dfe08
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 40 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ notification.mp3
/textual_inversion
.vscode
/extensions
/test/stdout.txt
/test/stderr.txt
19 changes: 19 additions & 0 deletions launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,12 @@ def prepare_enviroment():
blip_commit_hash = os.environ.get('BLIP_COMMIT_HASH', "48211a1594f1321b00f14c9f7a5b4813144b2fb9")

sys.argv += shlex.split(commandline_args)
test_argv = [x for x in sys.argv if x != '--tests']

sys.argv, skip_torch_cuda_test = extract_arg(sys.argv, '--skip-torch-cuda-test')
sys.argv, reinstall_xformers = extract_arg(sys.argv, '--reinstall-xformers')
sys.argv, update_check = extract_arg(sys.argv, '--update-check')
sys.argv, run_tests = extract_arg(sys.argv, '--tests')
xformers = '--xformers' in sys.argv
deepdanbooru = '--deepdanbooru' in sys.argv
ngrok = '--ngrok' in sys.argv
Expand Down Expand Up @@ -194,6 +196,23 @@ def prepare_enviroment():
print("Exiting because of --exit argument")
exit(0)

if run_tests:
tests(test_argv)
exit(0)


def tests(argv):
print(f"Launching Web UI in another process for testing with arguments: {' '.join(argv[1:])}")

with open('test/stdout.txt', "w", encoding="utf8") as stdout, open('test/stderr.txt', "w", encoding="utf8") as stderr:
proc = subprocess.Popen([sys.executable, *argv], stdout=stdout, stderr=stderr)

import test.server_poll
test.server_poll.run_tests()

print(f"Stopping Web UI process with id {proc.pid}")
proc.kill()


def start_webui():
print(f"Launching Web UI with arguments: {' '.join(sys.argv[1:])}")
Expand Down
15 changes: 0 additions & 15 deletions run_tests.bat

This file was deleted.

6 changes: 3 additions & 3 deletions test/extras_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import unittest
import requests
from gradio.processing_utils import encode_pil_to_base64
from PIL import Image


class TestExtrasWorking(unittest.TestCase):
def setUp(self):
Expand All @@ -22,8 +20,10 @@ def setUp(self):
"image": ""
}


class TestExtrasCorrectness(unittest.TestCase):
pass


if __name__ == "__main__":
unittest.main()
12 changes: 6 additions & 6 deletions test/img2img_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
from gradio.processing_utils import encode_pil_to_base64
from PIL import Image


class TestImg2ImgWorking(unittest.TestCase):
def setUp(self):
self.url_img2img = "http://localhost:7860/sdapi/v1/img2img"
self.simple_img2img = {
"init_images": [
encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png"))
],
"init_images": [encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png"))],
"resize_mode": 0,
"denoising_strength": 0.75,
"mask": None,
Expand All @@ -19,9 +18,7 @@ def setUp(self):
"inpaint_full_res_padding": 0,
"inpainting_mask_invert": 0,
"prompt": "example prompt",
"styles": [
""
],
"styles": [],
"seed": -1,
"subseed": -1,
"subseed_strength": 0,
Expand All @@ -45,15 +42,18 @@ def setUp(self):
"sampler_index": "Euler a",
"include_init_images": False
}

def test_img2img_simple_performed(self):
self.assertEqual(requests.post(self.url_img2img, json=self.simple_img2img).status_code, 200)

def test_inpainting_masked_performed(self):
self.simple_img2img["mask"] = encode_pil_to_base64(Image.open(r"test/test_files/mask_basic.png"))
self.assertEqual(requests.post(self.url_img2img, json=self.simple_img2img).status_code, 200)


class TestImg2ImgCorrectness(unittest.TestCase):
pass


if __name__ == "__main__":
unittest.main()
28 changes: 15 additions & 13 deletions test/server_poll.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
import requests
import time

timeout_threshold = 240
start_time = time.time()
while time.time()-start_time < timeout_threshold:
try:
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')
result = unittest.TextTestRunner(verbosity=2).run(suite)
else:
print("Launch unsuccessful")

def run_tests():
timeout_threshold = 240
start_time = time.time()
while time.time()-start_time < timeout_threshold:
try:
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')
result = unittest.TextTestRunner(verbosity=2).run(suite)
else:
print("Launch unsuccessful")
8 changes: 5 additions & 3 deletions test/txt2img_test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import unittest
import requests


class TestTxt2ImgWorking(unittest.TestCase):
def setUp(self):
self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img"
Expand All @@ -10,9 +11,7 @@ def setUp(self):
"firstphase_width": 0,
"firstphase_height": 0,
"prompt": "example prompt",
"styles": [
""
],
"styles": [],
"seed": -1,
"subseed": -1,
"subseed_strength": 0,
Expand All @@ -34,6 +33,7 @@ def setUp(self):
"s_noise": 1,
"sampler_index": "Euler a"
}

def test_txt2img_simple_performed(self):
self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)

Expand Down Expand Up @@ -65,8 +65,10 @@ def test_txt2img_multiple_batches_performed(self):
self.simple_txt2img["n_iter"] = 2
self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)


class TestTxt2ImgCorrectness(unittest.TestCase):
pass


if __name__ == "__main__":
unittest.main()

0 comments on commit 59dfe08

Please sign in to comment.