From 93d6c0209ae55632b72751cf82740e32a0cd81bc Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:39:22 +0300
Subject: Tests separated for github-actions CI

---
 test/basic_features/utils_test.py | 67 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 test/basic_features/utils_test.py

(limited to 'test/basic_features/utils_test.py')

diff --git a/test/basic_features/utils_test.py b/test/basic_features/utils_test.py
new file mode 100644
index 00000000..9706db8b
--- /dev/null
+++ b/test/basic_features/utils_test.py
@@ -0,0 +1,67 @@
+import unittest
+import requests
+
+class UtilsTests(unittest.TestCase):
+  def setUp(self):
+    self.url_options = "http://localhost:7860/sdapi/v1/options"
+    self.url_cmd_flags = "http://localhost:7860/sdapi/v1/cmd-flags"
+    self.url_samplers = "http://localhost:7860/sdapi/v1/samplers"
+    self.url_upscalers = "http://localhost:7860/sdapi/v1/upscalers"
+    self.url_sd_models = "http://localhost:7860/sdapi/v1/sd-models"
+    self.url_hypernetworks = "http://localhost:7860/sdapi/v1/hypernetworks"
+    self.url_face_restorers = "http://localhost:7860/sdapi/v1/face-restorers"
+    self.url_realesrgan_models = "http://localhost:7860/sdapi/v1/realesrgan-models"
+    self.url_prompt_styles = "http://localhost:7860/sdapi/v1/prompt-styles"
+    self.url_artist_categories = "http://localhost:7860/sdapi/v1/artist-categories"
+    self.url_artists = "http://localhost:7860/sdapi/v1/artists"
+
+  def test_options_get(self):
+    self.assertEqual(requests.get(self.url_options).status_code, 200)
+
+  # def test_options_write(self):
+  #   response = requests.get(self.url_options)
+  #   self.assertEqual(response.status_code, 200)
+    
+  #   pre_value = response.json()["send_seed"]
+
+  #   self.assertEqual(requests.post(self.url_options, json={"send_seed":not pre_value}).status_code, 200)
+
+  #   response = requests.get(self.url_options)
+  #   self.assertEqual(response.status_code, 200)
+  #   self.assertEqual(response.json()["send_seed"], not pre_value)
+
+  #   requests.post(self.url_options, json={"send_seed": pre_value})
+
+  def test_cmd_flags(self):
+    self.assertEqual(requests.get(self.url_cmd_flags).status_code, 200)
+
+  def test_samplers(self):
+    self.assertEqual(requests.get(self.url_samplers).status_code, 200)
+
+  def test_upscalers(self):
+    self.assertEqual(requests.get(self.url_upscalers).status_code, 200)
+
+  def test_sd_models(self):
+    self.assertEqual(requests.get(self.url_sd_models).status_code, 200)
+
+  def test_hypernetworks(self):
+    self.assertEqual(requests.get(self.url_hypernetworks).status_code, 200)
+
+  def test_face_restorers(self):
+    self.assertEqual(requests.get(self.url_face_restorers).status_code, 200)
+  
+  def test_realesrgan_models(self):
+    self.assertEqual(requests.get(self.url_realesrgan_models).status_code, 200)
+  
+  def test_prompt_styles(self):
+    self.assertEqual(requests.get(self.url_prompt_styles).status_code, 200)
+  
+  def test_artist_categories(self):
+    self.assertEqual(requests.get(self.url_artist_categories).status_code, 200)
+
+  def test_artists(self):
+    self.assertEqual(requests.get(self.url_artists).status_code, 200)
+
+
+if __name__ == "__main__":
+    unittest.main()
-- 
cgit v1.2.3


From 0646040667b59526ac8346d53efd14dc0e75b01e Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Mon, 14 Nov 2022 14:36:07 +0300
Subject: Propagate test error and try it without localhost

---
 launch.py                              |  7 ++++---
 test/advanced_features/extras_test.py  |  2 +-
 test/advanced_features/txt2img_test.py |  2 +-
 test/basic_features/img2img_test.py    |  2 +-
 test/basic_features/txt2img_test.py    |  2 +-
 test/basic_features/utils_test.py      | 22 +++++++++++-----------
 test/server_poll.py                    |  4 +++-
 7 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'test/basic_features/utils_test.py')

diff --git a/launch.py b/launch.py
index d0f502c2..8ed1dffc 100644
--- a/launch.py
+++ b/launch.py
@@ -234,8 +234,8 @@ def prepare_enviroment():
         exit(0)
 
     if run_tests:
-        tests(test_dir)
-        exit(0)
+        exitcode = tests(test_dir)
+        exit(exitcode)
 
 
 def tests(test_dir):
@@ -251,10 +251,11 @@ def tests(test_dir):
         proc = subprocess.Popen([sys.executable, *sys.argv], stdout=stdout, stderr=stderr)
 
     import test.server_poll
-    test.server_poll.run_tests(proc, test_dir)
+    exitcode = test.server_poll.run_tests(proc, test_dir)
 
     print(f"Stopping Web UI process with id {proc.pid}")
     proc.kill()
+    return exitcode
 
 
 def start():
diff --git a/test/advanced_features/extras_test.py b/test/advanced_features/extras_test.py
index 8763f8ed..abdd5aa2 100644
--- a/test/advanced_features/extras_test.py
+++ b/test/advanced_features/extras_test.py
@@ -3,7 +3,7 @@ import unittest
 
 class TestExtrasWorking(unittest.TestCase):
     def setUp(self):
-        self.url_img2img = "http://localhost:7860/sdapi/v1/extra-single-image"
+        self.url_img2img = "http://127.0.0.1:7860/sdapi/v1/extra-single-image"
         self.simple_extras = {
             "resize_mode": 0,
             "show_extras_results": True,
diff --git a/test/advanced_features/txt2img_test.py b/test/advanced_features/txt2img_test.py
index 36ed7b9a..6ab5a242 100644
--- a/test/advanced_features/txt2img_test.py
+++ b/test/advanced_features/txt2img_test.py
@@ -4,7 +4,7 @@ import requests
 
 class TestTxt2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img"
+        self.url_txt2img = "http://127.0.0.1:7860/sdapi/v1/txt2img"
         self.simple_txt2img = {
             "enable_hr": False,
             "denoising_strength": 0,
diff --git a/test/basic_features/img2img_test.py b/test/basic_features/img2img_test.py
index 0a9c1e8a..b9a34113 100644
--- a/test/basic_features/img2img_test.py
+++ b/test/basic_features/img2img_test.py
@@ -6,7 +6,7 @@ from PIL import Image
 
 class TestImg2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_img2img = "http://localhost:7860/sdapi/v1/img2img"
+        self.url_img2img = "http://127.0.0.1:7860/sdapi/v1/img2img"
         self.simple_img2img = {
             "init_images": [encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png"))],
             "resize_mode": 0,
diff --git a/test/basic_features/txt2img_test.py b/test/basic_features/txt2img_test.py
index fe4af999..0be675d9 100644
--- a/test/basic_features/txt2img_test.py
+++ b/test/basic_features/txt2img_test.py
@@ -4,7 +4,7 @@ import requests
 
 class TestTxt2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img"
+        self.url_txt2img = "http://127.0.0.1:7860/sdapi/v1/txt2img"
         self.simple_txt2img = {
             "enable_hr": False,
             "denoising_strength": 0,
diff --git a/test/basic_features/utils_test.py b/test/basic_features/utils_test.py
index 9706db8b..592f7619 100644
--- a/test/basic_features/utils_test.py
+++ b/test/basic_features/utils_test.py
@@ -3,17 +3,17 @@ import requests
 
 class UtilsTests(unittest.TestCase):
   def setUp(self):
-    self.url_options = "http://localhost:7860/sdapi/v1/options"
-    self.url_cmd_flags = "http://localhost:7860/sdapi/v1/cmd-flags"
-    self.url_samplers = "http://localhost:7860/sdapi/v1/samplers"
-    self.url_upscalers = "http://localhost:7860/sdapi/v1/upscalers"
-    self.url_sd_models = "http://localhost:7860/sdapi/v1/sd-models"
-    self.url_hypernetworks = "http://localhost:7860/sdapi/v1/hypernetworks"
-    self.url_face_restorers = "http://localhost:7860/sdapi/v1/face-restorers"
-    self.url_realesrgan_models = "http://localhost:7860/sdapi/v1/realesrgan-models"
-    self.url_prompt_styles = "http://localhost:7860/sdapi/v1/prompt-styles"
-    self.url_artist_categories = "http://localhost:7860/sdapi/v1/artist-categories"
-    self.url_artists = "http://localhost:7860/sdapi/v1/artists"
+    self.url_options = "http://127.0.0.1:7860/sdapi/v1/options"
+    self.url_cmd_flags = "http://127.0.0.1:7860/sdapi/v1/cmd-flags"
+    self.url_samplers = "http://127.0.0.1:7860/sdapi/v1/samplers"
+    self.url_upscalers = "http://127.0.0.1:7860/sdapi/v1/upscalers"
+    self.url_sd_models = "http://127.0.0.1:7860/sdapi/v1/sd-models"
+    self.url_hypernetworks = "http://127.0.0.1:7860/sdapi/v1/hypernetworks"
+    self.url_face_restorers = "http://127.0.0.1:7860/sdapi/v1/face-restorers"
+    self.url_realesrgan_models = "http://127.0.0.1:7860/sdapi/v1/realesrgan-models"
+    self.url_prompt_styles = "http://127.0.0.1:7860/sdapi/v1/prompt-styles"
+    self.url_artist_categories = "http://127.0.0.1:7860/sdapi/v1/artist-categories"
+    self.url_artists = "http://127.0.0.1:7860/sdapi/v1/artists"
 
   def test_options_get(self):
     self.assertEqual(requests.get(self.url_options).status_code, 200)
diff --git a/test/server_poll.py b/test/server_poll.py
index c71e906a..028fd476 100644
--- a/test/server_poll.py
+++ b/test/server_poll.py
@@ -8,7 +8,7 @@ def run_tests(proc, test_dir):
     start_time = time.time()
     while time.time()-start_time < timeout_threshold:
         try:
-            requests.head("http://localhost:7860/")
+            requests.head("http://127.0.0.1:7860/")
             break
         except requests.exceptions.ConnectionError:
             if proc.poll() is not None:
@@ -18,5 +18,7 @@ def run_tests(proc, test_dir):
             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)
     else:
         print("Launch unsuccessful")
+        return 1
-- 
cgit v1.2.3


From 7416ac8d3cadcc6a53bbcc41e1cd184fa1587afd Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Mon, 14 Nov 2022 14:55:39 +0300
Subject: Use localhost with 80 port, count errors as well

---
 test/advanced_features/extras_test.py  |  2 +-
 test/advanced_features/txt2img_test.py |  2 +-
 test/basic_features/img2img_test.py    |  2 +-
 test/basic_features/txt2img_test.py    |  2 +-
 test/basic_features/utils_test.py      | 22 +++++++++++-----------
 test/server_poll.py                    |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'test/basic_features/utils_test.py')

diff --git a/test/advanced_features/extras_test.py b/test/advanced_features/extras_test.py
index abdd5aa2..4b8ae25a 100644
--- a/test/advanced_features/extras_test.py
+++ b/test/advanced_features/extras_test.py
@@ -3,7 +3,7 @@ import unittest
 
 class TestExtrasWorking(unittest.TestCase):
     def setUp(self):
-        self.url_img2img = "http://127.0.0.1:7860/sdapi/v1/extra-single-image"
+        self.url_img2img = "http://localhost:80/sdapi/v1/extra-single-image"
         self.simple_extras = {
             "resize_mode": 0,
             "show_extras_results": True,
diff --git a/test/advanced_features/txt2img_test.py b/test/advanced_features/txt2img_test.py
index 6ab5a242..e6c3531a 100644
--- a/test/advanced_features/txt2img_test.py
+++ b/test/advanced_features/txt2img_test.py
@@ -4,7 +4,7 @@ import requests
 
 class TestTxt2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_txt2img = "http://127.0.0.1:7860/sdapi/v1/txt2img"
+        self.url_txt2img = "http://localhost:80/sdapi/v1/txt2img"
         self.simple_txt2img = {
             "enable_hr": False,
             "denoising_strength": 0,
diff --git a/test/basic_features/img2img_test.py b/test/basic_features/img2img_test.py
index b9a34113..c4c9a90f 100644
--- a/test/basic_features/img2img_test.py
+++ b/test/basic_features/img2img_test.py
@@ -6,7 +6,7 @@ from PIL import Image
 
 class TestImg2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_img2img = "http://127.0.0.1:7860/sdapi/v1/img2img"
+        self.url_img2img = "http://localhost:80/sdapi/v1/img2img"
         self.simple_img2img = {
             "init_images": [encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png"))],
             "resize_mode": 0,
diff --git a/test/basic_features/txt2img_test.py b/test/basic_features/txt2img_test.py
index 0be675d9..4f1fc77d 100644
--- a/test/basic_features/txt2img_test.py
+++ b/test/basic_features/txt2img_test.py
@@ -4,7 +4,7 @@ import requests
 
 class TestTxt2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_txt2img = "http://127.0.0.1:7860/sdapi/v1/txt2img"
+        self.url_txt2img = "http://localhost:80/sdapi/v1/txt2img"
         self.simple_txt2img = {
             "enable_hr": False,
             "denoising_strength": 0,
diff --git a/test/basic_features/utils_test.py b/test/basic_features/utils_test.py
index 592f7619..fdb72b9a 100644
--- a/test/basic_features/utils_test.py
+++ b/test/basic_features/utils_test.py
@@ -3,17 +3,17 @@ import requests
 
 class UtilsTests(unittest.TestCase):
   def setUp(self):
-    self.url_options = "http://127.0.0.1:7860/sdapi/v1/options"
-    self.url_cmd_flags = "http://127.0.0.1:7860/sdapi/v1/cmd-flags"
-    self.url_samplers = "http://127.0.0.1:7860/sdapi/v1/samplers"
-    self.url_upscalers = "http://127.0.0.1:7860/sdapi/v1/upscalers"
-    self.url_sd_models = "http://127.0.0.1:7860/sdapi/v1/sd-models"
-    self.url_hypernetworks = "http://127.0.0.1:7860/sdapi/v1/hypernetworks"
-    self.url_face_restorers = "http://127.0.0.1:7860/sdapi/v1/face-restorers"
-    self.url_realesrgan_models = "http://127.0.0.1:7860/sdapi/v1/realesrgan-models"
-    self.url_prompt_styles = "http://127.0.0.1:7860/sdapi/v1/prompt-styles"
-    self.url_artist_categories = "http://127.0.0.1:7860/sdapi/v1/artist-categories"
-    self.url_artists = "http://127.0.0.1:7860/sdapi/v1/artists"
+    self.url_options = "http://localhost:80/sdapi/v1/options"
+    self.url_cmd_flags = "http://localhost:80/sdapi/v1/cmd-flags"
+    self.url_samplers = "http://localhost:80/sdapi/v1/samplers"
+    self.url_upscalers = "http://localhost:80/sdapi/v1/upscalers"
+    self.url_sd_models = "http://localhost:80/sdapi/v1/sd-models"
+    self.url_hypernetworks = "http://localhost:80/sdapi/v1/hypernetworks"
+    self.url_face_restorers = "http://localhost:80/sdapi/v1/face-restorers"
+    self.url_realesrgan_models = "http://localhost:80/sdapi/v1/realesrgan-models"
+    self.url_prompt_styles = "http://localhost:80/sdapi/v1/prompt-styles"
+    self.url_artist_categories = "http://localhost:80/sdapi/v1/artist-categories"
+    self.url_artists = "http://localhost:80/sdapi/v1/artists"
 
   def test_options_get(self):
     self.assertEqual(requests.get(self.url_options).status_code, 200)
diff --git a/test/server_poll.py b/test/server_poll.py
index 028fd476..e4462b6c 100644
--- a/test/server_poll.py
+++ b/test/server_poll.py
@@ -8,7 +8,7 @@ def run_tests(proc, test_dir):
     start_time = time.time()
     while time.time()-start_time < timeout_threshold:
         try:
-            requests.head("http://127.0.0.1:7860/")
+            requests.head("http://localhost:80/")
             break
         except requests.exceptions.ConnectionError:
             if proc.poll() is not None:
@@ -18,7 +18,7 @@ def run_tests(proc, test_dir):
             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)
+        return len(result.failures) + len(result.errors)
     else:
         print("Launch unsuccessful")
         return 1
-- 
cgit v1.2.3


From 9e4f68acad4697fdf10004eb85d3f6f769c2c70b Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:40:15 +0300
Subject: Stop exporting cl args and upload stdout and stderr as artifacts

---
 .github/workflows/run_tests.yaml       | 11 +++++++++--
 launch.py                              |  2 ++
 test/advanced_features/extras_test.py  |  2 +-
 test/advanced_features/txt2img_test.py |  2 +-
 test/basic_features/img2img_test.py    |  2 +-
 test/basic_features/txt2img_test.py    |  2 +-
 test/basic_features/utils_test.py      | 22 +++++++++++-----------
 test/server_poll.py                    |  2 +-
 8 files changed, 27 insertions(+), 18 deletions(-)

(limited to 'test/basic_features/utils_test.py')

diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml
index 223a31b9..558b0c61 100644
--- a/.github/workflows/run_tests.yaml
+++ b/.github/workflows/run_tests.yaml
@@ -22,5 +22,12 @@ jobs:
             ${{ runner.os }}-pip-
       - name: Run tests
         run: |
-          export COMMANDLINE_ARGS="--tests basic_features --no-half --disable-opt-split-attention --use-cpu all --skip-torch-cuda-test --port 80"
-          python launch.py
+          python launch.py --tests basic_features --no-half --disable-opt-split-attention --use-cpu all --skip-torch-cuda-test
+      - name: Upload main app stdout-stderr
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: stdout-stderr
+          path: |
+            ./test/stdout.txt
+            ./test/stderr.txt
diff --git a/launch.py b/launch.py
index 8ed1dffc..ed21d0e6 100644
--- a/launch.py
+++ b/launch.py
@@ -244,6 +244,8 @@ def tests(test_dir):
     if "--ckpt" not in sys.argv:
         sys.argv.append("--ckpt")
         sys.argv.append("./test/test_files/empty.pt")
+    if "--skip-torch-cuda-test" not in sys.argv:
+        sys.argv.append("--skip-torch-cuda-test")
 
     print(f"Launching Web UI in another process for testing with arguments: {' '.join(sys.argv[1:])}")
 
diff --git a/test/advanced_features/extras_test.py b/test/advanced_features/extras_test.py
index 4b8ae25a..8763f8ed 100644
--- a/test/advanced_features/extras_test.py
+++ b/test/advanced_features/extras_test.py
@@ -3,7 +3,7 @@ import unittest
 
 class TestExtrasWorking(unittest.TestCase):
     def setUp(self):
-        self.url_img2img = "http://localhost:80/sdapi/v1/extra-single-image"
+        self.url_img2img = "http://localhost:7860/sdapi/v1/extra-single-image"
         self.simple_extras = {
             "resize_mode": 0,
             "show_extras_results": True,
diff --git a/test/advanced_features/txt2img_test.py b/test/advanced_features/txt2img_test.py
index e6c3531a..36ed7b9a 100644
--- a/test/advanced_features/txt2img_test.py
+++ b/test/advanced_features/txt2img_test.py
@@ -4,7 +4,7 @@ import requests
 
 class TestTxt2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_txt2img = "http://localhost:80/sdapi/v1/txt2img"
+        self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img"
         self.simple_txt2img = {
             "enable_hr": False,
             "denoising_strength": 0,
diff --git a/test/basic_features/img2img_test.py b/test/basic_features/img2img_test.py
index c4c9a90f..0a9c1e8a 100644
--- a/test/basic_features/img2img_test.py
+++ b/test/basic_features/img2img_test.py
@@ -6,7 +6,7 @@ from PIL import Image
 
 class TestImg2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_img2img = "http://localhost:80/sdapi/v1/img2img"
+        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"))],
             "resize_mode": 0,
diff --git a/test/basic_features/txt2img_test.py b/test/basic_features/txt2img_test.py
index 4f1fc77d..fe4af999 100644
--- a/test/basic_features/txt2img_test.py
+++ b/test/basic_features/txt2img_test.py
@@ -4,7 +4,7 @@ import requests
 
 class TestTxt2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_txt2img = "http://localhost:80/sdapi/v1/txt2img"
+        self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img"
         self.simple_txt2img = {
             "enable_hr": False,
             "denoising_strength": 0,
diff --git a/test/basic_features/utils_test.py b/test/basic_features/utils_test.py
index fdb72b9a..9706db8b 100644
--- a/test/basic_features/utils_test.py
+++ b/test/basic_features/utils_test.py
@@ -3,17 +3,17 @@ import requests
 
 class UtilsTests(unittest.TestCase):
   def setUp(self):
-    self.url_options = "http://localhost:80/sdapi/v1/options"
-    self.url_cmd_flags = "http://localhost:80/sdapi/v1/cmd-flags"
-    self.url_samplers = "http://localhost:80/sdapi/v1/samplers"
-    self.url_upscalers = "http://localhost:80/sdapi/v1/upscalers"
-    self.url_sd_models = "http://localhost:80/sdapi/v1/sd-models"
-    self.url_hypernetworks = "http://localhost:80/sdapi/v1/hypernetworks"
-    self.url_face_restorers = "http://localhost:80/sdapi/v1/face-restorers"
-    self.url_realesrgan_models = "http://localhost:80/sdapi/v1/realesrgan-models"
-    self.url_prompt_styles = "http://localhost:80/sdapi/v1/prompt-styles"
-    self.url_artist_categories = "http://localhost:80/sdapi/v1/artist-categories"
-    self.url_artists = "http://localhost:80/sdapi/v1/artists"
+    self.url_options = "http://localhost:7860/sdapi/v1/options"
+    self.url_cmd_flags = "http://localhost:7860/sdapi/v1/cmd-flags"
+    self.url_samplers = "http://localhost:7860/sdapi/v1/samplers"
+    self.url_upscalers = "http://localhost:7860/sdapi/v1/upscalers"
+    self.url_sd_models = "http://localhost:7860/sdapi/v1/sd-models"
+    self.url_hypernetworks = "http://localhost:7860/sdapi/v1/hypernetworks"
+    self.url_face_restorers = "http://localhost:7860/sdapi/v1/face-restorers"
+    self.url_realesrgan_models = "http://localhost:7860/sdapi/v1/realesrgan-models"
+    self.url_prompt_styles = "http://localhost:7860/sdapi/v1/prompt-styles"
+    self.url_artist_categories = "http://localhost:7860/sdapi/v1/artist-categories"
+    self.url_artists = "http://localhost:7860/sdapi/v1/artists"
 
   def test_options_get(self):
     self.assertEqual(requests.get(self.url_options).status_code, 200)
diff --git a/test/server_poll.py b/test/server_poll.py
index e4462b6c..d4df697b 100644
--- a/test/server_poll.py
+++ b/test/server_poll.py
@@ -8,7 +8,7 @@ def run_tests(proc, test_dir):
     start_time = time.time()
     while time.time()-start_time < timeout_threshold:
         try:
-            requests.head("http://localhost:80/")
+            requests.head("http://localhost:7860/")
             break
         except requests.exceptions.ConnectionError:
             if proc.poll() is not None:
-- 
cgit v1.2.3


From 14dfede8ddbf6b82bb290d5c4292d52b6b68e3ca Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Sat, 19 Nov 2022 14:15:10 +0300
Subject: Minor fixes

Remove unused test completely
Change job name
Don't use empty.pt as CLIP weights - it wont work.
Use latest version of actions/cache
---
 .github/workflows/run_tests.yaml  |  9 ++++-----
 test/basic_features/utils_test.py | 14 --------------
 2 files changed, 4 insertions(+), 19 deletions(-)

(limited to 'test/basic_features/utils_test.py')

diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml
index 6c6f15a8..49dc92bd 100644
--- a/.github/workflows/run_tests.yaml
+++ b/.github/workflows/run_tests.yaml
@@ -1,4 +1,4 @@
-name: Run tests on CPU with empty model
+name: Run basic features tests on CPU with empty SD model
 
 on:
   - push
@@ -14,14 +14,13 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.10.6
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          restore-keys: ${{ runner.os }}-pip-
       - name: Run tests
-        run: python launch.py --tests basic_features --no-half --disable-opt-split-attention --use-cpu all --skip-torch-cuda-test --clip-models-path ./test/test_files/empty.pt
+        run: python launch.py --tests basic_features --no-half --disable-opt-split-attention --use-cpu all --skip-torch-cuda-test
       - name: Upload main app stdout-stderr
         uses: actions/upload-artifact@v3
         if: always()
diff --git a/test/basic_features/utils_test.py b/test/basic_features/utils_test.py
index 9706db8b..765470c9 100644
--- a/test/basic_features/utils_test.py
+++ b/test/basic_features/utils_test.py
@@ -18,20 +18,6 @@ class UtilsTests(unittest.TestCase):
   def test_options_get(self):
     self.assertEqual(requests.get(self.url_options).status_code, 200)
 
-  # def test_options_write(self):
-  #   response = requests.get(self.url_options)
-  #   self.assertEqual(response.status_code, 200)
-    
-  #   pre_value = response.json()["send_seed"]
-
-  #   self.assertEqual(requests.post(self.url_options, json={"send_seed":not pre_value}).status_code, 200)
-
-  #   response = requests.get(self.url_options)
-  #   self.assertEqual(response.status_code, 200)
-  #   self.assertEqual(response.json()["send_seed"], not pre_value)
-
-  #   requests.post(self.url_options, json={"send_seed": pre_value})
-
   def test_cmd_flags(self):
     self.assertEqual(requests.get(self.url_cmd_flags).status_code, 200)
 
-- 
cgit v1.2.3


From 7d2bb86cce10ee6a8e81aaad810544a4ca38cec9 Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:39:06 +0300
Subject: combine tests together, return set options test

---
 test/advanced_features/__init__.py     |  0
 test/advanced_features/extras_test.py  | 29 ---------------------
 test/advanced_features/txt2img_test.py | 47 ----------------------------------
 test/basic_features/extras_test.py     | 29 +++++++++++++++++++++
 test/basic_features/txt2img_test.py    |  4 +++
 test/basic_features/utils_test.py      | 14 ++++++++++
 6 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 test/advanced_features/__init__.py
 delete mode 100644 test/advanced_features/extras_test.py
 delete mode 100644 test/advanced_features/txt2img_test.py
 create mode 100644 test/basic_features/extras_test.py

(limited to 'test/basic_features/utils_test.py')

diff --git a/test/advanced_features/__init__.py b/test/advanced_features/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/advanced_features/extras_test.py b/test/advanced_features/extras_test.py
deleted file mode 100644
index 8763f8ed..00000000
--- a/test/advanced_features/extras_test.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import unittest
-
-
-class TestExtrasWorking(unittest.TestCase):
-    def setUp(self):
-        self.url_img2img = "http://localhost:7860/sdapi/v1/extra-single-image"
-        self.simple_extras = {
-            "resize_mode": 0,
-            "show_extras_results": True,
-            "gfpgan_visibility": 0,
-            "codeformer_visibility": 0,
-            "codeformer_weight": 0,
-            "upscaling_resize": 2,
-            "upscaling_resize_w": 128,
-            "upscaling_resize_h": 128,
-            "upscaling_crop": True,
-            "upscaler_1": "None",
-            "upscaler_2": "None",
-            "extras_upscaler_2_visibility": 0,
-            "image": ""
-            }
-
-
-class TestExtrasCorrectness(unittest.TestCase):
-    pass
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/test/advanced_features/txt2img_test.py b/test/advanced_features/txt2img_test.py
deleted file mode 100644
index 36ed7b9a..00000000
--- a/test/advanced_features/txt2img_test.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import unittest
-import requests
-
-
-class TestTxt2ImgWorking(unittest.TestCase):
-    def setUp(self):
-        self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img"
-        self.simple_txt2img = {
-            "enable_hr": False,
-            "denoising_strength": 0,
-            "firstphase_width": 0,
-            "firstphase_height": 0,
-            "prompt": "example prompt",
-            "styles": [],
-            "seed": -1,
-            "subseed": -1,
-            "subseed_strength": 0,
-            "seed_resize_from_h": -1,
-            "seed_resize_from_w": -1,
-            "batch_size": 1,
-            "n_iter": 1,
-            "steps": 3,
-            "cfg_scale": 7,
-            "width": 64,
-            "height": 64,
-            "restore_faces": False,
-            "tiling": False,
-            "negative_prompt": "",
-            "eta": 0,
-            "s_churn": 0,
-            "s_tmax": 0,
-            "s_tmin": 0,
-            "s_noise": 1,
-            "sampler_index": "Euler a"
-        }
-
-    def test_txt2img_with_restore_faces_performed(self):
-        self.simple_txt2img["restore_faces"] = True
-        self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
-
-
-class TestTxt2ImgCorrectness(unittest.TestCase):
-    pass
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/test/basic_features/extras_test.py b/test/basic_features/extras_test.py
new file mode 100644
index 00000000..8763f8ed
--- /dev/null
+++ b/test/basic_features/extras_test.py
@@ -0,0 +1,29 @@
+import unittest
+
+
+class TestExtrasWorking(unittest.TestCase):
+    def setUp(self):
+        self.url_img2img = "http://localhost:7860/sdapi/v1/extra-single-image"
+        self.simple_extras = {
+            "resize_mode": 0,
+            "show_extras_results": True,
+            "gfpgan_visibility": 0,
+            "codeformer_visibility": 0,
+            "codeformer_weight": 0,
+            "upscaling_resize": 2,
+            "upscaling_resize_w": 128,
+            "upscaling_resize_h": 128,
+            "upscaling_crop": True,
+            "upscaler_1": "None",
+            "upscaler_2": "None",
+            "extras_upscaler_2_visibility": 0,
+            "image": ""
+            }
+
+
+class TestExtrasCorrectness(unittest.TestCase):
+    pass
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test/basic_features/txt2img_test.py b/test/basic_features/txt2img_test.py
index 1c2674b2..bbc846ed 100644
--- a/test/basic_features/txt2img_test.py
+++ b/test/basic_features/txt2img_test.py
@@ -63,6 +63,10 @@ class TestTxt2ImgWorking(unittest.TestCase):
         self.simple_txt2img["n_iter"] = 2
         self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
 
+    def test_txt2img_with_restore_faces_performed(self):
+        self.simple_txt2img["restore_faces"] = True
+        self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/test/basic_features/utils_test.py b/test/basic_features/utils_test.py
index 765470c9..b3c4045a 100644
--- a/test/basic_features/utils_test.py
+++ b/test/basic_features/utils_test.py
@@ -18,6 +18,20 @@ class UtilsTests(unittest.TestCase):
   def test_options_get(self):
     self.assertEqual(requests.get(self.url_options).status_code, 200)
 
+  def test_options_write(self):
+    response = requests.get(self.url_options)
+    self.assertEqual(response.status_code, 200)
+
+    pre_value = response.json()["send_seed"]
+
+    self.assertEqual(requests.post(self.url_options, json={"send_seed":not pre_value}).status_code, 200)
+
+    response = requests.get(self.url_options)
+    self.assertEqual(response.status_code, 200)
+    self.assertEqual(response.json()["send_seed"], not pre_value)
+
+    requests.post(self.url_options, json={"send_seed": pre_value})
+
   def test_cmd_flags(self):
     self.assertEqual(requests.get(self.url_cmd_flags).status_code, 200)
 
-- 
cgit v1.2.3


From 00005ac9af10d58a75f7ce0aa04db78775808e93 Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Mon, 9 Jan 2023 21:01:28 +0300
Subject: add more tests

---
 test/basic_features/extras_test.py  | 37 +++++++++++++++++++++++++++++++------
 test/basic_features/img2img_test.py |  7 ++++++-
 test/basic_features/txt2img_test.py | 11 +++++++++--
 test/basic_features/utils_test.py   |  3 +++
 4 files changed, 49 insertions(+), 9 deletions(-)

(limited to 'test/basic_features/utils_test.py')

diff --git a/test/basic_features/extras_test.py b/test/basic_features/extras_test.py
index 8763f8ed..0170c511 100644
--- a/test/basic_features/extras_test.py
+++ b/test/basic_features/extras_test.py
@@ -1,10 +1,12 @@
 import unittest
-
+import requests
+from gradio.processing_utils import encode_pil_to_base64
+from PIL import Image
 
 class TestExtrasWorking(unittest.TestCase):
     def setUp(self):
-        self.url_img2img = "http://localhost:7860/sdapi/v1/extra-single-image"
-        self.simple_extras = {
+        self.url_extras_single = "http://localhost:7860/sdapi/v1/extra-single-image"
+        self.extras_single = {
             "resize_mode": 0,
             "show_extras_results": True,
             "gfpgan_visibility": 0,
@@ -17,12 +19,35 @@ class TestExtrasWorking(unittest.TestCase):
             "upscaler_1": "None",
             "upscaler_2": "None",
             "extras_upscaler_2_visibility": 0,
-            "image": ""
+            "image": encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png"))
             }
 
+    def test_simple_upscaling_performed(self):
+        self.extras_single["upscaler_1"] = "Lanczos"
+        self.assertEqual(requests.post(self.url_extras_single, json=self.extras_single).status_code, 200)
+
+
+class TestPngInfoWorking(unittest.TestCase):
+    def setUp(self):
+        self.url_png_info = "http://localhost:7860/sdapi/v1/extra-single-image"
+        self.png_info = {
+            "image": encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png"))
+        }
+
+    def test_png_info_performed(self):
+        self.assertEqual(requests.post(self.url_png_info, json=self.png_info).status_code, 200)
+
+
+class TestInterrogateWorking(unittest.TestCase):
+    def setUp(self):
+        self.url_interrogate = "http://localhost:7860/sdapi/v1/extra-single-image"
+        self.interrogate = {
+            "image": encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png")),
+            "model": "clip"
+        }
 
-class TestExtrasCorrectness(unittest.TestCase):
-    pass
+    def test_interrogate_performed(self):
+        self.assertEqual(requests.post(self.url_interrogate, json=self.interrogate).status_code, 200)
 
 
 if __name__ == "__main__":
diff --git a/test/basic_features/img2img_test.py b/test/basic_features/img2img_test.py
index bd520b13..08c5c903 100644
--- a/test/basic_features/img2img_test.py
+++ b/test/basic_features/img2img_test.py
@@ -16,7 +16,7 @@ class TestImg2ImgWorking(unittest.TestCase):
             "inpainting_fill": 0,
             "inpaint_full_res": False,
             "inpaint_full_res_padding": 0,
-            "inpainting_mask_invert": 0,
+            "inpainting_mask_invert": False,
             "prompt": "example prompt",
             "styles": [],
             "seed": -1,
@@ -50,6 +50,11 @@ class TestImg2ImgWorking(unittest.TestCase):
         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)
 
+    def test_inpainting_with_inverted_masked_performed(self):
+        self.simple_img2img["mask"] = encode_pil_to_base64(Image.open(r"test/test_files/mask_basic.png"))
+        self.simple_img2img["inpainting_mask_invert"] = True
+        self.assertEqual(requests.post(self.url_img2img, json=self.simple_img2img).status_code, 200)
+
     def test_img2img_sd_upscale_performed(self):
         self.simple_img2img["script_name"] = "sd upscale"
         self.simple_img2img["script_args"] = ["", 8, "Lanczos", 2.0]
diff --git a/test/basic_features/txt2img_test.py b/test/basic_features/txt2img_test.py
index bbc846ed..5b27a7ec 100644
--- a/test/basic_features/txt2img_test.py
+++ b/test/basic_features/txt2img_test.py
@@ -41,6 +41,9 @@ class TestTxt2ImgWorking(unittest.TestCase):
         self.simple_txt2img["negative_prompt"] = "example negative prompt"
         self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
 
+    def test_txt2img_with_complex_prompt_performed(self):
+        self.simple_txt2img["prompt"] = "((emphasis)), (emphasis1:1.1), [to:1], [from::2], [from:to:0.3], [alt|alt1]"
+
     def test_txt2img_not_square_image_performed(self):
         self.simple_txt2img["height"] = 128
         self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
@@ -53,6 +56,10 @@ class TestTxt2ImgWorking(unittest.TestCase):
         self.simple_txt2img["tiling"] = True
         self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
 
+    def test_txt2img_with_restore_faces_performed(self):
+        self.simple_txt2img["restore_faces"] = True
+        self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
+
     def test_txt2img_with_vanilla_sampler_performed(self):
         self.simple_txt2img["sampler_index"] = "PLMS"
         self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
@@ -63,8 +70,8 @@ class TestTxt2ImgWorking(unittest.TestCase):
         self.simple_txt2img["n_iter"] = 2
         self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
 
-    def test_txt2img_with_restore_faces_performed(self):
-        self.simple_txt2img["restore_faces"] = True
+    def test_txt2img_batch_performed(self):
+        self.simple_txt2img["batch_size"] = 2
         self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200)
 
 
diff --git a/test/basic_features/utils_test.py b/test/basic_features/utils_test.py
index b3c4045a..94e00253 100644
--- a/test/basic_features/utils_test.py
+++ b/test/basic_features/utils_test.py
@@ -14,6 +14,7 @@ class UtilsTests(unittest.TestCase):
     self.url_prompt_styles = "http://localhost:7860/sdapi/v1/prompt-styles"
     self.url_artist_categories = "http://localhost:7860/sdapi/v1/artist-categories"
     self.url_artists = "http://localhost:7860/sdapi/v1/artists"
+    self.url_embeddings = "http://localhost:7860/sdapi/v1/embeddings"
 
   def test_options_get(self):
     self.assertEqual(requests.get(self.url_options).status_code, 200)
@@ -62,6 +63,8 @@ class UtilsTests(unittest.TestCase):
   def test_artists(self):
     self.assertEqual(requests.get(self.url_artists).status_code, 200)
 
+  def test_embeddings(self):
+    self.assertEqual(requests.get(self.url_artists).status_code, 200)
 
 if __name__ == "__main__":
     unittest.main()
-- 
cgit v1.2.3