Tests separated for github-actions CI

1 files changed, 24 insertions, 12 deletions

diff --git a/launch.py b/launch.py
index 6822a01d..d0f502c2 100644
--- a/launch.py
+++ b/launch.py
@@ -17,6 +17,19 @@ def extract_arg(args, name):
     return [x for x in args if x != name], name in args

 

 

+def extract_opt(args, name):

+    opt = None

+    is_present = False

+    if name in args:

+        is_present = True

+        idx = args.index(name)

+        del args[idx]

+        if idx < len(args) and args[idx][0] != "-":

+            opt = args[idx]

+            del args[idx]

+    return args, is_present, opt

+

+

 def run(command, desc=None, errdesc=None, custom_env=None):

     if desc is not None:

         print(desc)

@@ -151,12 +164,11 @@ 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')

+    sys.argv, run_tests, test_dir = extract_opt(sys.argv, '--tests')

     xformers = '--xformers' in sys.argv

     deepdanbooru = '--deepdanbooru' in sys.argv

     ngrok = '--ngrok' in sys.argv

@@ -222,24 +234,24 @@ def prepare_enviroment():
         exit(0)

 

     if run_tests:

-        tests(test_argv)

+        tests(test_dir)

         exit(0)

 

 

-def tests(argv):

-    if "--api" not in argv:

-        argv.append("--api")

-    if "--ckpt" not in argv:

-        argv.append("--ckpt")

-        argv.append("./test/test_files/empty.pt")

+def tests(test_dir):

+    if "--api" not in sys.argv:

+        sys.argv.append("--api")

+    if "--ckpt" not in sys.argv:

+        sys.argv.append("--ckpt")

+        sys.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(sys.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)

+        proc = subprocess.Popen([sys.executable, *sys.argv], stdout=stdout, stderr=stderr)

 

     import test.server_poll

-    test.server_poll.run_tests(proc)

+    test.server_poll.run_tests(proc, test_dir)

 

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

     proc.kill()