Skip to content

Commit

Permalink
Stop exporting cl args and upload stdout and stderr as artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
mezotaken authored Nov 14, 2022
1 parent 5808241 commit 9e4f68a
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 18 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/run_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:])}")

Expand Down
2 changes: 1 addition & 1 deletion test/advanced_features/extras_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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,
Expand Down
2 changes: 1 addition & 1 deletion test/advanced_features/txt2img_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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,
Expand Down
2 changes: 1 addition & 1 deletion test/basic_features/img2img_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

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,
Expand Down
2 changes: 1 addition & 1 deletion test/basic_features/txt2img_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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,
Expand Down
22 changes: 11 additions & 11 deletions test/basic_features/utils_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@

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)
Expand Down
2 changes: 1 addition & 1 deletion test/server_poll.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 9e4f68a

Please sign in to comment.