diff --git a/Makefile b/Makefile index 1aa661df3..c1b51764b 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,8 @@ define rm_unused_docker_containers docker ps -a --filter "status=exited" --filter "name=$(1)" --format "{{.ID}}" | xargs --no-run-if-empty docker rm endef +PYTEST = poetry run pytest -s + .PHONY: test_run test_run: # cleanup @@ -17,7 +19,7 @@ test_run: # build/run docker compose -f docker-compose.test.yml build test_studio_backend docker compose -f docker-compose.test.yml build test_studio_frontend - docker compose -f docker-compose.test.yml run test_studio_backend + docker compose -f docker-compose.test.yml run test_studio_backend $(PYTEST) -m "not heavier_processing" docker compose -f docker-compose.test.yml run test_studio_frontend .PHONY: test_backend @@ -28,7 +30,17 @@ test_backend: @$(call rm_unused_docker_containers, test_studio_backend) # build/run docker compose -f docker-compose.test.yml build test_studio_backend - docker compose -f docker-compose.test.yml run test_studio_backend + docker compose -f docker-compose.test.yml run test_studio_backend $(PYTEST) -m "not heavier_processing" + +.PHONY: test_backend_full +test_backend_full: + # cleanup + docker compose -f docker-compose.test.yml down + docker compose -f docker-compose.test.yml rm -f + @$(call rm_unused_docker_containers, test_studio_backend) + # build/run + docker compose -f docker-compose.test.yml build test_studio_backend + docker compose -f docker-compose.test.yml run test_studio_backend $(PYTEST) .PHONY: test_frontend test_frontend: diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 2f43c3f5d..1aac157bd 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -8,7 +8,6 @@ services: environment: PYTHONPATH: . TZ: Asia/Tokyo - command: bash -c "poetry run python3 -m pytest -s" volumes: - .:/app diff --git a/pyproject.toml b/pyproject.toml index f67912f4c..c2c96e1ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -126,8 +126,8 @@ filterwarnings = [ "ignore:invalid escape sequence :DeprecationWarning", ] markers = [ - "snakemake_executor_lccd", - "snakemake_executor_suite2p", + "lighter_processing", + "heavier_processing", ] [tool.codespell] diff --git a/studio/tests/app/common/core/snakemake/test_snakemake_executor_lccd.py b/studio/tests/app/common/core/snakemake/test_snakemake_executor_lccd.py index b3b998939..188bb0a5e 100644 --- a/studio/tests/app/common/core/snakemake/test_snakemake_executor_lccd.py +++ b/studio/tests/app/common/core/snakemake/test_snakemake_executor_lccd.py @@ -91,7 +91,7 @@ output_dirpath = f"{DIRPATH.OUTPUT_DIR}/{workspace_id}/{unique_id}" -@pytest.mark.snakemake_executor_lccd +@pytest.mark.lighter_processing def test_snakemake_execute(client): """ Test for Run snakemake @@ -120,7 +120,7 @@ def test_snakemake_execute(client): assert os.path.exists(error_log_filepath) -@pytest.mark.snakemake_executor_lccd +@pytest.mark.lighter_processing def test_snakemake_delete_dependencies(): """ Test for delete snakemake dependencies diff --git a/studio/tests/app/common/core/snakemake/test_snakemake_executor_suite2p.py b/studio/tests/app/common/core/snakemake/test_snakemake_executor_suite2p.py index d7d2fe02f..8c0ae716c 100644 --- a/studio/tests/app/common/core/snakemake/test_snakemake_executor_suite2p.py +++ b/studio/tests/app/common/core/snakemake/test_snakemake_executor_suite2p.py @@ -91,7 +91,7 @@ output_dirpath = f"{DIRPATH.OUTPUT_DIR}/{workspace_id}/{unique_id}" -@pytest.mark.snakemake_executor_suite2p +@pytest.mark.heavier_processing def test_snakemake_execute(client): """ Test for Run snakemake @@ -120,7 +120,7 @@ def test_snakemake_execute(client): assert os.path.exists(error_log_filepath) -@pytest.mark.snakemake_executor_suite2p +@pytest.mark.heavier_processing def test_snakemake_delete_dependencies(): """ Test for delete snakemake dependencies