Moved tests

1. test/integration_tests => test/integration 2. test/contract_tests => test/contract
exasol · Oct 2, 2024 · 520613d · 520613d
1 parent c5c5a2f
commit 520613d
Show file tree

Hide file tree

Showing 70 changed files with 4 additions and 7 deletions.
diff --git a/exasol_script_languages_container_ci/lib/config/config_data_model.py b/exasol_script_languages_container_ci/lib/config/config_data_model.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -43,7 +43,7 @@ force_grid_wrap = 2
 
 [tool.pytest.ini_options]
 minversion = "6.0"
-addopts = "--ignore=test/integration_tests/resources"
+addopts = "--ignore=test/integration/resources"
 
 testpaths = [
     "test"

diff --git a/test/conftest.py b/test/conftest.py
@@ -55,7 +55,7 @@ def pytest_configure(config):
 
 @pytest.fixture
 def resources_path() -> Path:
-    return script_path / "integration_tests/resources"
+    return script_path / "integration/resources"
 
 
 @pytest.fixture

diff --git a/test/contract_tests/__init__.py → test/contract/__init__.py b/test/contract_tests/__init__.py → test/contract/__init__.py
diff --git a/test/contract_tests/test_ci_test.py → test/contract/test_ci_test.py b/test/contract_tests/test_ci_test.py → test/contract/test_ci_test.py
diff --git a/test/integration_tests/__init__.py → test/integration/__init__.py b/test/integration_tests/__init__.py → test/integration/__init__.py
diff --git a/test/integration_tests/resources/__init__.py → test/integration/resources/__init__.py b/test/integration_tests/resources/__init__.py → test/integration/resources/__init__.py
diff --git a/...ation_tests/resources/flavors/__init__.py → ...integration/resources/flavors/__init__.py b/...ation_tests/resources/flavors/__init__.py → ...integration/resources/flavors/__init__.py
diff --git a/...s/flavors/failing_run_db_test/__init__.py → ...s/flavors/failing_run_db_test/__init__.py b/...s/flavors/failing_run_db_test/__init__.py → ...s/flavors/failing_run_db_test/__init__.py
diff --git a/...iling_run_db_test/flavor_base/__init__.py → ...iling_run_db_test/flavor_base/__init__.py b/...iling_run_db_test/flavor_base/__init__.py → ...iling_run_db_test/flavor_base/__init__.py
diff --git a/...lavor_base/base_test_build_run/Dockerfile → ...lavor_base/base_test_build_run/Dockerfile b/...lavor_base/base_test_build_run/Dockerfile → ...lavor_base/base_test_build_run/Dockerfile
diff --git a/...ng_run_db_test/flavor_base/build_steps.py → ...ng_run_db_test/flavor_base/build_steps.py b/...ng_run_db_test/flavor_base/build_steps.py → ...ng_run_db_test/flavor_base/build_steps.py
diff --git a/...vor_base/flavor_test_build_run/Dockerfile → ...vor_base/flavor_test_build_run/Dockerfile b/...vor_base/flavor_test_build_run/Dockerfile → ...vor_base/flavor_test_build_run/Dockerfile
diff --git a/...n_db_test/flavor_base/language_definition → ...n_db_test/flavor_base/language_definition b/...n_db_test/flavor_base/language_definition → ...n_db_test/flavor_base/language_definition
diff --git a/...un_db_test/flavor_base/release/Dockerfile → ...un_db_test/flavor_base/release/Dockerfile b/...un_db_test/flavor_base/release/Dockerfile → ...un_db_test/flavor_base/release/Dockerfile
diff --git a/...test/flavor_base/security_scan/Dockerfile → ...test/flavor_base/security_scan/Dockerfile b/...test/flavor_base/security_scan/Dockerfile → ...test/flavor_base/security_scan/Dockerfile
diff --git a/...db_test/flavor_base/security_scan/test.sh → ...db_test/flavor_base/security_scan/test.sh b/...db_test/flavor_base/security_scan/test.sh → ...db_test/flavor_base/security_scan/test.sh
diff --git a/...ailing_run_db_test/flavor_base/testconfig → ...ailing_run_db_test/flavor_base/testconfig b/...ailing_run_db_test/flavor_base/testconfig → ...ailing_run_db_test/flavor_base/testconfig
diff --git a/...n_db_test/flavor_customization/Dockerfile → ...n_db_test/flavor_customization/Dockerfile b/...n_db_test/flavor_customization/Dockerfile → ...n_db_test/flavor_customization/Dockerfile
diff --git a/...flavors/failing_security_scan/__init__.py → ...flavors/failing_security_scan/__init__.py b/...flavors/failing_security_scan/__init__.py → ...flavors/failing_security_scan/__init__.py
diff --git a/...ing_security_scan/flavor_base/__init__.py → ...ing_security_scan/flavor_base/__init__.py b/...ing_security_scan/flavor_base/__init__.py → ...ing_security_scan/flavor_base/__init__.py
diff --git a/...lavor_base/base_test_build_run/Dockerfile → ...lavor_base/base_test_build_run/Dockerfile b/...lavor_base/base_test_build_run/Dockerfile → ...lavor_base/base_test_build_run/Dockerfile
diff --git a/..._security_scan/flavor_base/build_steps.py → ..._security_scan/flavor_base/build_steps.py b/..._security_scan/flavor_base/build_steps.py → ..._security_scan/flavor_base/build_steps.py
diff --git a/...vor_base/flavor_test_build_run/Dockerfile → ...vor_base/flavor_test_build_run/Dockerfile b/...vor_base/flavor_test_build_run/Dockerfile → ...vor_base/flavor_test_build_run/Dockerfile
diff --git a/...rity_scan/flavor_base/language_definition → ...rity_scan/flavor_base/language_definition b/...rity_scan/flavor_base/language_definition → ...rity_scan/flavor_base/language_definition
diff --git a/...urity_scan/flavor_base/release/Dockerfile → ...urity_scan/flavor_base/release/Dockerfile b/...urity_scan/flavor_base/release/Dockerfile → ...urity_scan/flavor_base/release/Dockerfile
diff --git a/...scan/flavor_base/security_scan/Dockerfile → ...scan/flavor_base/security_scan/Dockerfile b/...scan/flavor_base/security_scan/Dockerfile → ...scan/flavor_base/security_scan/Dockerfile
diff --git a/...ty_scan/flavor_base/security_scan/test.sh → ...ty_scan/flavor_base/security_scan/test.sh b/...ty_scan/flavor_base/security_scan/test.sh → ...ty_scan/flavor_base/security_scan/test.sh
diff --git a/...ling_security_scan/flavor_base/testconfig → ...ling_security_scan/flavor_base/testconfig b/...ling_security_scan/flavor_base/testconfig → ...ling_security_scan/flavor_base/testconfig
diff --git a/...rity_scan/flavor_customization/Dockerfile → ...rity_scan/flavor_customization/Dockerfile b/...rity_scan/flavor_customization/Dockerfile → ...rity_scan/flavor_customization/Dockerfile
diff --git a/.../resources/flavors/successful/__init__.py → .../resources/flavors/successful/__init__.py b/.../resources/flavors/successful/__init__.py → .../resources/flavors/successful/__init__.py
diff --git a/...lavors/successful/flavor_base/__init__.py → ...lavors/successful/flavor_base/__init__.py b/...lavors/successful/flavor_base/__init__.py → ...lavors/successful/flavor_base/__init__.py
diff --git a/...lavor_base/base_test_build_run/Dockerfile → ...lavor_base/base_test_build_run/Dockerfile b/...lavor_base/base_test_build_run/Dockerfile → ...lavor_base/base_test_build_run/Dockerfile
diff --git a/...ors/successful/flavor_base/build_steps.py → ...ors/successful/flavor_base/build_steps.py b/...ors/successful/flavor_base/build_steps.py → ...ors/successful/flavor_base/build_steps.py
diff --git a/...vor_base/flavor_test_build_run/Dockerfile → ...vor_base/flavor_test_build_run/Dockerfile b/...vor_base/flavor_test_build_run/Dockerfile → ...vor_base/flavor_test_build_run/Dockerfile
diff --git a/...uccessful/flavor_base/language_definition → ...uccessful/flavor_base/language_definition b/...uccessful/flavor_base/language_definition → ...uccessful/flavor_base/language_definition
diff --git a/...successful/flavor_base/release/Dockerfile → ...successful/flavor_base/release/Dockerfile b/...successful/flavor_base/release/Dockerfile → ...successful/flavor_base/release/Dockerfile
diff --git a/...sful/flavor_base/security_scan/Dockerfile → ...sful/flavor_base/security_scan/Dockerfile b/...sful/flavor_base/security_scan/Dockerfile → ...sful/flavor_base/security_scan/Dockerfile
diff --git a/...cessful/flavor_base/security_scan/test.sh → ...cessful/flavor_base/security_scan/test.sh b/...cessful/flavor_base/security_scan/test.sh → ...cessful/flavor_base/security_scan/test.sh
diff --git a/...flavors/successful/flavor_base/testconfig → ...flavors/successful/flavor_base/testconfig b/...flavors/successful/flavor_base/testconfig → ...flavors/successful/flavor_base/testconfig
diff --git a/...uccessful/flavor_customization/Dockerfile → ...uccessful/flavor_customization/Dockerfile b/...uccessful/flavor_customization/Dockerfile → ...uccessful/flavor_customization/Dockerfile
diff --git a/...sts/resources/test_containers/__init__.py → ...ion/resources/test_containers/__init__.py b/...sts/resources/test_containers/__init__.py → ...ion/resources/test_containers/__init__.py
diff --git a/...urces/test_containers/failing/__init__.py → ...urces/test_containers/failing/__init__.py b/...urces/test_containers/failing/__init__.py → ...urces/test_containers/failing/__init__.py
diff --git a/.../test_containers/failing/build/Dockerfile → .../test_containers/failing/build/Dockerfile b/.../test_containers/failing/build/Dockerfile → .../test_containers/failing/build/Dockerfile
diff --git a/...st_containers/failing/build/deps/01_nodoc → ...st_containers/failing/build/deps/01_nodoc b/...st_containers/failing/build/deps/01_nodoc → ...st_containers/failing/build/deps/01_nodoc
diff --git a/...iners/failing/build/deps/requirements.txt → ...iners/failing/build/deps/requirements.txt b/...iners/failing/build/deps/requirements.txt → ...iners/failing/build/deps/requirements.txt
diff --git a/...iling/test_data/enginedb_small/import.sql → ...iling/test_data/enginedb_small/import.sql b/...iling/test_data/enginedb_small/import.sql → ...iling/test_data/enginedb_small/import.sql
diff --git a/...test_containers/failing/tests/__init__.py → ...test_containers/failing/tests/__init__.py b/...test_containers/failing/tests/__init__.py → ...test_containers/failing/tests/__init__.py
diff --git a/...containers/failing/tests/test/__init__.py → ...containers/failing/tests/test/__init__.py b/...containers/failing/tests/test/__init__.py → ...containers/failing/tests/test/__init__.py
diff --git a/...iling/tests/test/failing_test/__init__.py → ...iling/tests/test/failing_test/__init__.py b/...iling/tests/test/failing_test/__init__.py → ...iling/tests/test/failing_test/__init__.py
diff --git a/...g/tests/test/failing_test/failing_test.py → ...g/tests/test/failing_test/failing_test.py b/...g/tests/test/failing_test/failing_test.py → ...g/tests/test/failing_test/failing_test.py
diff --git a/.../test/linker_namespace_sanity/__init__.py → .../test/linker_namespace_sanity/__init__.py b/.../test/linker_namespace_sanity/__init__.py → .../test/linker_namespace_sanity/__init__.py
diff --git a/...t/linker_namespace_sanity/failing_test.py → ...t/linker_namespace_sanity/failing_test.py b/...t/linker_namespace_sanity/failing_test.py → ...t/linker_namespace_sanity/failing_test.py
diff --git a/...es/test_containers/successful/__init__.py → ...es/test_containers/successful/__init__.py b/...es/test_containers/successful/__init__.py → ...es/test_containers/successful/__init__.py
diff --git a/...st_containers/successful/build/Dockerfile → ...st_containers/successful/build/Dockerfile b/...st_containers/successful/build/Dockerfile → ...st_containers/successful/build/Dockerfile
diff --git a/...containers/successful/build/deps/01_nodoc → ...containers/successful/build/deps/01_nodoc b/...containers/successful/build/deps/01_nodoc → ...containers/successful/build/deps/01_nodoc
diff --git a/...rs/successful/build/deps/requirements.txt → ...rs/successful/build/deps/requirements.txt b/...rs/successful/build/deps/requirements.txt → ...rs/successful/build/deps/requirements.txt
diff --git a/...ssful/test_data/enginedb_small/import.sql → ...ssful/test_data/enginedb_small/import.sql b/...ssful/test_data/enginedb_small/import.sql → ...ssful/test_data/enginedb_small/import.sql
diff --git a/...t_containers/successful/tests/__init__.py → ...t_containers/successful/tests/__init__.py b/...t_containers/successful/tests/__init__.py → ...t_containers/successful/tests/__init__.py
diff --git a/...tainers/successful/tests/test/__init__.py → ...tainers/successful/tests/test/__init__.py b/...tainers/successful/tests/test/__init__.py → ...tainers/successful/tests/test/__init__.py
diff --git a/.../test/linker_namespace_sanity/__init__.py → .../test/linker_namespace_sanity/__init__.py b/.../test/linker_namespace_sanity/__init__.py → .../test/linker_namespace_sanity/__init__.py
diff --git a/...inker_namespace_sanity/successful_test.py → ...inker_namespace_sanity/successful_test.py b/...inker_namespace_sanity/successful_test.py → ...inker_namespace_sanity/successful_test.py
diff --git a/...ul/tests/test/successful_test/__init__.py → ...ul/tests/test/successful_test/__init__.py b/...ul/tests/test/successful_test/__init__.py → ...ul/tests/test/successful_test/__init__.py
diff --git a/...s/test/successful_test/successful_test.py → ...s/test/successful_test/successful_test.py b/...s/test/successful_test/successful_test.py → ...s/test/successful_test/successful_test.py
diff --git a/test/integration_tests/test_ci_build.py → test/integration/test_ci_build.py b/test/integration_tests/test_ci_build.py → test/integration/test_ci_build.py
diff --git a/test/integration_tests/test_ci_export.py → test/integration/test_ci_export.py b/test/integration_tests/test_ci_export.py → test/integration/test_ci_export.py
diff --git a/test/integration_tests/test_ci_prepare.py → test/integration/test_ci_prepare.py b/test/integration_tests/test_ci_prepare.py → test/integration/test_ci_prepare.py
diff --git a/test/integration_tests/test_ci_push.py → test/integration/test_ci_push.py b/test/integration_tests/test_ci_push.py → test/integration/test_ci_push.py
diff --git a/...ntegration_tests/test_ci_security_scan.py → test/integration/test_ci_security_scan.py b/...ntegration_tests/test_ci_security_scan.py → test/integration/test_ci_security_scan.py
diff --git a/test/integration_tests/test_ci_test.py → test/integration/test_ci_test.py b/test/integration_tests/test_ci_test.py → test/integration/test_ci_test.py