From a2da8985bf1da6ea7454fe6f24181b9a461ebc90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <alan.munoz@ed.ac.uk>
Date: Sat, 24 Sep 2022 13:38:01 +0100
Subject: [PATCH] ci(tests): rearrange tests to isolate network comp
---
.gitlab-ci.yml | 11 +++++------
tests/{ => aliby/network}/argo/test_argo.py | 0
tests/aliby/{ => network}/test_baby_client.py | 0
tests/aliby/{ => network}/test_connect_to_omero.py | 0
tests/aliby/{ => network}/test_local_expt.py | 0
tests/aliby/{ => network}/test_pipeline.py | 0
tests/aliby/{ => network}/test_post_processing.py | 0
tests/aliby/{ => network}/test_segment.py | 0
tests/aliby/{ => network}/test_tiler.py | 0
tests/aliby/{ => network}/test_traps.py | 0
10 files changed, 5 insertions(+), 6 deletions(-)
rename tests/{ => aliby/network}/argo/test_argo.py (100%)
rename tests/aliby/{ => network}/test_baby_client.py (100%)
rename tests/aliby/{ => network}/test_connect_to_omero.py (100%)
rename tests/aliby/{ => network}/test_local_expt.py (100%)
rename tests/aliby/{ => network}/test_pipeline.py (100%)
rename tests/aliby/{ => network}/test_post_processing.py (100%)
rename tests/aliby/{ => network}/test_segment.py (100%)
rename tests/aliby/{ => network}/test_tiler.py (100%)
rename tests/aliby/{ => network}/test_traps.py (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90548efa..e0b81c31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,22 +29,21 @@ before_script:
# - if [ ${var+TRIGGER_PYPI_NAME} ]; then echo "Pipeline triggered by ${TRIGGER_PYPI_NAME}"; poetry add ${TRIGGER_PYPI_NAME}@latest; fi
- export OPT_DEP="test";
- export PYTEST_FOLDER="";
- - echo $CI_STAGE_NAME
- if [[ "$CI_STAGE_NAME" == "test" ]]; then echo "Installing system dependencies for ${CI_STAGE_NAME}"; apt update && apt install -y ffmpeg libsm6 libxext6; fi
- if [[ "$CI_JOB_NAME" == "Integration Test" ]]; then echo "Setting flag to compile zeroc-ice"; export OPT_DEP="test,network"; fi
- poetry install -vv --with $OPT_DEP
-Local Units Test:
+Local Tests:
stage: test
script:
- - poetry run pytest --ignore ./tests/aliby
+ - poetry run pytest --ignore ./tests/aliby/network
-# TODO add Network Units
+# TODO Split testing in four: Network vs non-network and Unit vs integration
-Integration Test:
+Network Tools Test:
stage: test
script:
- - poetry run pytest ./tests/aliby/
+ - poetry run pytest ./tests/aliby/network
Code Lint:
stage: check
diff --git a/tests/argo/test_argo.py b/tests/aliby/network/argo/test_argo.py
similarity index 100%
rename from tests/argo/test_argo.py
rename to tests/aliby/network/argo/test_argo.py
diff --git a/tests/aliby/test_baby_client.py b/tests/aliby/network/test_baby_client.py
similarity index 100%
rename from tests/aliby/test_baby_client.py
rename to tests/aliby/network/test_baby_client.py
diff --git a/tests/aliby/test_connect_to_omero.py b/tests/aliby/network/test_connect_to_omero.py
similarity index 100%
rename from tests/aliby/test_connect_to_omero.py
rename to tests/aliby/network/test_connect_to_omero.py
diff --git a/tests/aliby/test_local_expt.py b/tests/aliby/network/test_local_expt.py
similarity index 100%
rename from tests/aliby/test_local_expt.py
rename to tests/aliby/network/test_local_expt.py
diff --git a/tests/aliby/test_pipeline.py b/tests/aliby/network/test_pipeline.py
similarity index 100%
rename from tests/aliby/test_pipeline.py
rename to tests/aliby/network/test_pipeline.py
diff --git a/tests/aliby/test_post_processing.py b/tests/aliby/network/test_post_processing.py
similarity index 100%
rename from tests/aliby/test_post_processing.py
rename to tests/aliby/network/test_post_processing.py
diff --git a/tests/aliby/test_segment.py b/tests/aliby/network/test_segment.py
similarity index 100%
rename from tests/aliby/test_segment.py
rename to tests/aliby/network/test_segment.py
diff --git a/tests/aliby/test_tiler.py b/tests/aliby/network/test_tiler.py
similarity index 100%
rename from tests/aliby/test_tiler.py
rename to tests/aliby/network/test_tiler.py
diff --git a/tests/aliby/test_traps.py b/tests/aliby/network/test_traps.py
similarity index 100%
rename from tests/aliby/test_traps.py
rename to tests/aliby/network/test_traps.py
--
GitLab