From 81fce18c7392a8759728f7f831ec85c02e88fcd9 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Thu, 28 Sep 2023 09:55:20 -0400 Subject: [PATCH] reorder pytests to prevent fixture race condition --- tests/{nodes => AA_nodes}/__init__.py | 0 .../test_graph_execution_state.py | 0 tests/{nodes => AA_nodes}/test_invoker.py | 0 tests/{nodes => AA_nodes}/test_node_graph.py | 0 tests/{nodes => AA_nodes}/test_nodes.py | 0 tests/{nodes => AA_nodes}/test_session_queue.py | 2 +- tests/{nodes => AA_nodes}/test_sqlite.py | 0 tests/{ => AB_config}/test_config.py | 0 tests/{ => AB_config}/test_model_config2.py | 0 tests/{ => AB_config}/test_path.py | 0 .../README.txt | 0 .../test_model_download.py | 0 .../test_model_install_service.py | 0 .../test_embedding.safetensors | Bin .../test_model_manager.py | 0 .../configs/relative_sub.models.yaml | 0 .../models/sdxl/main/SDXL base 1_0/model_index.json | 0 .../models/sdxl/vae/sdxl-vae-fp16-fix/config.json | 0 .../test_model_probe.py | 0 .../test_model_probe/vae/sd-vae-ft-mse/config.json | 0 .../test_model_probe/vae/sdxl-vae/config.json | 0 .../test_model_probe/vae/taesd/config.json | 0 .../test_model_probe/vae/taesdxl/config.json | 0 .../test_model_storage_file.py | 0 .../test_model_storage_sql.py | 0 .../coyote-inpainting.prompt | 0 .../{inpainting => AD_inpainting}/coyote-input.webp | Bin .../{inpainting => AD_inpainting}/coyote-mask.webp | Bin tests/{inpainting => AD_inpainting}/original.json | 0 29 files changed, 1 insertion(+), 1 deletion(-) rename tests/{nodes => AA_nodes}/__init__.py (100%) rename tests/{nodes => AA_nodes}/test_graph_execution_state.py (100%) rename tests/{nodes => AA_nodes}/test_invoker.py (100%) rename tests/{nodes => AA_nodes}/test_node_graph.py (100%) rename tests/{nodes => AA_nodes}/test_nodes.py (100%) rename tests/{nodes => AA_nodes}/test_session_queue.py (99%) rename tests/{nodes => AA_nodes}/test_sqlite.py (100%) rename tests/{ => AB_config}/test_config.py (100%) rename tests/{ => AB_config}/test_model_config2.py (100%) rename tests/{ => AB_config}/test_path.py (100%) rename tests/{x_model_manager => AC_model_manager}/README.txt (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_download.py (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_install_service.py (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_install_service/test_embedding.safetensors (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_manager.py (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_manager/configs/relative_sub.models.yaml (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_manager/models/sdxl/main/SDXL base 1_0/model_index.json (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_manager/models/sdxl/vae/sdxl-vae-fp16-fix/config.json (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_probe.py (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_probe/vae/sd-vae-ft-mse/config.json (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_probe/vae/sdxl-vae/config.json (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_probe/vae/taesd/config.json (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_probe/vae/taesdxl/config.json (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_storage_file.py (100%) rename tests/{x_model_manager => AC_model_manager}/test_model_storage_sql.py (100%) rename tests/{inpainting => AD_inpainting}/coyote-inpainting.prompt (100%) rename tests/{inpainting => AD_inpainting}/coyote-input.webp (100%) rename tests/{inpainting => AD_inpainting}/coyote-mask.webp (100%) rename tests/{inpainting => AD_inpainting}/original.json (100%) diff --git a/tests/nodes/__init__.py b/tests/AA_nodes/__init__.py similarity index 100% rename from tests/nodes/__init__.py rename to tests/AA_nodes/__init__.py diff --git a/tests/nodes/test_graph_execution_state.py b/tests/AA_nodes/test_graph_execution_state.py similarity index 100% rename from tests/nodes/test_graph_execution_state.py rename to tests/AA_nodes/test_graph_execution_state.py diff --git a/tests/nodes/test_invoker.py b/tests/AA_nodes/test_invoker.py similarity index 100% rename from tests/nodes/test_invoker.py rename to tests/AA_nodes/test_invoker.py diff --git a/tests/nodes/test_node_graph.py b/tests/AA_nodes/test_node_graph.py similarity index 100% rename from tests/nodes/test_node_graph.py rename to tests/AA_nodes/test_node_graph.py diff --git a/tests/nodes/test_nodes.py b/tests/AA_nodes/test_nodes.py similarity index 100% rename from tests/nodes/test_nodes.py rename to tests/AA_nodes/test_nodes.py diff --git a/tests/nodes/test_session_queue.py b/tests/AA_nodes/test_session_queue.py similarity index 99% rename from tests/nodes/test_session_queue.py rename to tests/AA_nodes/test_session_queue.py index f28ec1ac54..01be0adb69 100644 --- a/tests/nodes/test_session_queue.py +++ b/tests/AA_nodes/test_session_queue.py @@ -12,7 +12,7 @@ from invokeai.app.services.session_queue.session_queue_common import ( populate_graph, prepare_values_to_insert, ) -from tests.nodes.test_nodes import PromptTestInvocation +from .test_nodes import PromptTestInvocation @pytest.fixture diff --git a/tests/nodes/test_sqlite.py b/tests/AA_nodes/test_sqlite.py similarity index 100% rename from tests/nodes/test_sqlite.py rename to tests/AA_nodes/test_sqlite.py diff --git a/tests/test_config.py b/tests/AB_config/test_config.py similarity index 100% rename from tests/test_config.py rename to tests/AB_config/test_config.py diff --git a/tests/test_model_config2.py b/tests/AB_config/test_model_config2.py similarity index 100% rename from tests/test_model_config2.py rename to tests/AB_config/test_model_config2.py diff --git a/tests/test_path.py b/tests/AB_config/test_path.py similarity index 100% rename from tests/test_path.py rename to tests/AB_config/test_path.py diff --git a/tests/x_model_manager/README.txt b/tests/AC_model_manager/README.txt similarity index 100% rename from tests/x_model_manager/README.txt rename to tests/AC_model_manager/README.txt diff --git a/tests/x_model_manager/test_model_download.py b/tests/AC_model_manager/test_model_download.py similarity index 100% rename from tests/x_model_manager/test_model_download.py rename to tests/AC_model_manager/test_model_download.py diff --git a/tests/x_model_manager/test_model_install_service.py b/tests/AC_model_manager/test_model_install_service.py similarity index 100% rename from tests/x_model_manager/test_model_install_service.py rename to tests/AC_model_manager/test_model_install_service.py diff --git a/tests/x_model_manager/test_model_install_service/test_embedding.safetensors b/tests/AC_model_manager/test_model_install_service/test_embedding.safetensors similarity index 100% rename from tests/x_model_manager/test_model_install_service/test_embedding.safetensors rename to tests/AC_model_manager/test_model_install_service/test_embedding.safetensors diff --git a/tests/x_model_manager/test_model_manager.py b/tests/AC_model_manager/test_model_manager.py similarity index 100% rename from tests/x_model_manager/test_model_manager.py rename to tests/AC_model_manager/test_model_manager.py diff --git a/tests/x_model_manager/test_model_manager/configs/relative_sub.models.yaml b/tests/AC_model_manager/test_model_manager/configs/relative_sub.models.yaml similarity index 100% rename from tests/x_model_manager/test_model_manager/configs/relative_sub.models.yaml rename to tests/AC_model_manager/test_model_manager/configs/relative_sub.models.yaml diff --git a/tests/x_model_manager/test_model_manager/models/sdxl/main/SDXL base 1_0/model_index.json b/tests/AC_model_manager/test_model_manager/models/sdxl/main/SDXL base 1_0/model_index.json similarity index 100% rename from tests/x_model_manager/test_model_manager/models/sdxl/main/SDXL base 1_0/model_index.json rename to tests/AC_model_manager/test_model_manager/models/sdxl/main/SDXL base 1_0/model_index.json diff --git a/tests/x_model_manager/test_model_manager/models/sdxl/vae/sdxl-vae-fp16-fix/config.json b/tests/AC_model_manager/test_model_manager/models/sdxl/vae/sdxl-vae-fp16-fix/config.json similarity index 100% rename from tests/x_model_manager/test_model_manager/models/sdxl/vae/sdxl-vae-fp16-fix/config.json rename to tests/AC_model_manager/test_model_manager/models/sdxl/vae/sdxl-vae-fp16-fix/config.json diff --git a/tests/x_model_manager/test_model_probe.py b/tests/AC_model_manager/test_model_probe.py similarity index 100% rename from tests/x_model_manager/test_model_probe.py rename to tests/AC_model_manager/test_model_probe.py diff --git a/tests/x_model_manager/test_model_probe/vae/sd-vae-ft-mse/config.json b/tests/AC_model_manager/test_model_probe/vae/sd-vae-ft-mse/config.json similarity index 100% rename from tests/x_model_manager/test_model_probe/vae/sd-vae-ft-mse/config.json rename to tests/AC_model_manager/test_model_probe/vae/sd-vae-ft-mse/config.json diff --git a/tests/x_model_manager/test_model_probe/vae/sdxl-vae/config.json b/tests/AC_model_manager/test_model_probe/vae/sdxl-vae/config.json similarity index 100% rename from tests/x_model_manager/test_model_probe/vae/sdxl-vae/config.json rename to tests/AC_model_manager/test_model_probe/vae/sdxl-vae/config.json diff --git a/tests/x_model_manager/test_model_probe/vae/taesd/config.json b/tests/AC_model_manager/test_model_probe/vae/taesd/config.json similarity index 100% rename from tests/x_model_manager/test_model_probe/vae/taesd/config.json rename to tests/AC_model_manager/test_model_probe/vae/taesd/config.json diff --git a/tests/x_model_manager/test_model_probe/vae/taesdxl/config.json b/tests/AC_model_manager/test_model_probe/vae/taesdxl/config.json similarity index 100% rename from tests/x_model_manager/test_model_probe/vae/taesdxl/config.json rename to tests/AC_model_manager/test_model_probe/vae/taesdxl/config.json diff --git a/tests/x_model_manager/test_model_storage_file.py b/tests/AC_model_manager/test_model_storage_file.py similarity index 100% rename from tests/x_model_manager/test_model_storage_file.py rename to tests/AC_model_manager/test_model_storage_file.py diff --git a/tests/x_model_manager/test_model_storage_sql.py b/tests/AC_model_manager/test_model_storage_sql.py similarity index 100% rename from tests/x_model_manager/test_model_storage_sql.py rename to tests/AC_model_manager/test_model_storage_sql.py diff --git a/tests/inpainting/coyote-inpainting.prompt b/tests/AD_inpainting/coyote-inpainting.prompt similarity index 100% rename from tests/inpainting/coyote-inpainting.prompt rename to tests/AD_inpainting/coyote-inpainting.prompt diff --git a/tests/inpainting/coyote-input.webp b/tests/AD_inpainting/coyote-input.webp similarity index 100% rename from tests/inpainting/coyote-input.webp rename to tests/AD_inpainting/coyote-input.webp diff --git a/tests/inpainting/coyote-mask.webp b/tests/AD_inpainting/coyote-mask.webp similarity index 100% rename from tests/inpainting/coyote-mask.webp rename to tests/AD_inpainting/coyote-mask.webp diff --git a/tests/inpainting/original.json b/tests/AD_inpainting/original.json similarity index 100% rename from tests/inpainting/original.json rename to tests/AD_inpainting/original.json