From 520613df7c99d8e5aebe1cc1e78ce5aeb7e430a9 Mon Sep 17 00:00:00 2001 From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:45:30 +0200 Subject: [PATCH] Moved tests 1. test/integration_tests => test/integration 2. test/contract_tests => test/contract --- .../lib/config/config_data_model.py | 7 ++----- pyproject.toml | 2 +- test/conftest.py | 2 +- test/{contract_tests => contract}/__init__.py | 0 test/{contract_tests => contract}/test_ci_test.py | 0 test/{integration_tests => integration}/__init__.py | 0 .../resources/__init__.py | 0 .../resources/flavors/__init__.py | 0 .../resources/flavors/failing_run_db_test/__init__.py | 0 .../flavors/failing_run_db_test/flavor_base/__init__.py | 0 .../flavor_base/base_test_build_run/Dockerfile | 0 .../flavors/failing_run_db_test/flavor_base/build_steps.py | 0 .../flavor_base/flavor_test_build_run/Dockerfile | 0 .../failing_run_db_test/flavor_base/language_definition | 0 .../failing_run_db_test/flavor_base/release/Dockerfile | 0 .../flavor_base/security_scan/Dockerfile | 0 .../failing_run_db_test/flavor_base/security_scan/test.sh | 0 .../flavors/failing_run_db_test/flavor_base/testconfig | 0 .../failing_run_db_test/flavor_customization/Dockerfile | 0 .../resources/flavors/failing_security_scan/__init__.py | 0 .../flavors/failing_security_scan/flavor_base/__init__.py | 0 .../flavor_base/base_test_build_run/Dockerfile | 0 .../failing_security_scan/flavor_base/build_steps.py | 0 .../flavor_base/flavor_test_build_run/Dockerfile | 0 .../failing_security_scan/flavor_base/language_definition | 0 .../failing_security_scan/flavor_base/release/Dockerfile | 0 .../flavor_base/security_scan/Dockerfile | 0 .../flavor_base/security_scan/test.sh | 0 .../flavors/failing_security_scan/flavor_base/testconfig | 0 .../failing_security_scan/flavor_customization/Dockerfile | 0 .../resources/flavors/successful/__init__.py | 0 .../resources/flavors/successful/flavor_base/__init__.py | 0 .../successful/flavor_base/base_test_build_run/Dockerfile | 0 .../flavors/successful/flavor_base/build_steps.py | 0 .../flavor_base/flavor_test_build_run/Dockerfile | 0 .../flavors/successful/flavor_base/language_definition | 0 .../flavors/successful/flavor_base/release/Dockerfile | 0 .../successful/flavor_base/security_scan/Dockerfile | 0 .../flavors/successful/flavor_base/security_scan/test.sh | 0 .../resources/flavors/successful/flavor_base/testconfig | 0 .../flavors/successful/flavor_customization/Dockerfile | 0 .../resources/test_containers/__init__.py | 0 .../resources/test_containers/failing/__init__.py | 0 .../resources/test_containers/failing/build/Dockerfile | 0 .../resources/test_containers/failing/build/deps/01_nodoc | 0 .../test_containers/failing/build/deps/requirements.txt | 0 .../failing/test_data/enginedb_small/import.sql | 0 .../resources/test_containers/failing/tests/__init__.py | 0 .../test_containers/failing/tests/test/__init__.py | 0 .../failing/tests/test/failing_test/__init__.py | 0 .../failing/tests/test/failing_test/failing_test.py | 0 .../failing/tests/test/linker_namespace_sanity/__init__.py | 0 .../tests/test/linker_namespace_sanity/failing_test.py | 0 .../resources/test_containers/successful/__init__.py | 0 .../resources/test_containers/successful/build/Dockerfile | 0 .../test_containers/successful/build/deps/01_nodoc | 0 .../test_containers/successful/build/deps/requirements.txt | 0 .../successful/test_data/enginedb_small/import.sql | 0 .../resources/test_containers/successful/tests/__init__.py | 0 .../test_containers/successful/tests/test/__init__.py | 0 .../tests/test/linker_namespace_sanity/__init__.py | 0 .../tests/test/linker_namespace_sanity/successful_test.py | 0 .../successful/tests/test/successful_test/__init__.py | 0 .../tests/test/successful_test/successful_test.py | 0 test/{integration_tests => integration}/test_ci_build.py | 0 test/{integration_tests => integration}/test_ci_export.py | 0 test/{integration_tests => integration}/test_ci_prepare.py | 0 test/{integration_tests => integration}/test_ci_push.py | 0 .../test_ci_security_scan.py | 0 test/{integration_tests => integration}/test_ci_test.py | 0 70 files changed, 4 insertions(+), 7 deletions(-) rename test/{contract_tests => contract}/__init__.py (100%) rename test/{contract_tests => contract}/test_ci_test.py (100%) rename test/{integration_tests => integration}/__init__.py (100%) rename test/{integration_tests => integration}/resources/__init__.py (100%) rename test/{integration_tests => integration}/resources/flavors/__init__.py (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/__init__.py (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_base/__init__.py (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_base/base_test_build_run/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_base/build_steps.py (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_base/flavor_test_build_run/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_base/language_definition (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_base/release/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_base/security_scan/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_base/security_scan/test.sh (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_base/testconfig (100%) rename test/{integration_tests => integration}/resources/flavors/failing_run_db_test/flavor_customization/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/__init__.py (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_base/__init__.py (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_base/base_test_build_run/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_base/build_steps.py (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_base/flavor_test_build_run/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_base/language_definition (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_base/release/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_base/security_scan/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_base/security_scan/test.sh (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_base/testconfig (100%) rename test/{integration_tests => integration}/resources/flavors/failing_security_scan/flavor_customization/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/successful/__init__.py (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_base/__init__.py (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_base/base_test_build_run/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_base/build_steps.py (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_base/flavor_test_build_run/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_base/language_definition (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_base/release/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_base/security_scan/Dockerfile (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_base/security_scan/test.sh (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_base/testconfig (100%) rename test/{integration_tests => integration}/resources/flavors/successful/flavor_customization/Dockerfile (100%) rename test/{integration_tests => integration}/resources/test_containers/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/build/Dockerfile (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/build/deps/01_nodoc (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/build/deps/requirements.txt (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/test_data/enginedb_small/import.sql (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/tests/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/tests/test/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/tests/test/failing_test/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/tests/test/failing_test/failing_test.py (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/tests/test/linker_namespace_sanity/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/failing/tests/test/linker_namespace_sanity/failing_test.py (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/build/Dockerfile (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/build/deps/01_nodoc (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/build/deps/requirements.txt (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/test_data/enginedb_small/import.sql (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/tests/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/tests/test/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/tests/test/linker_namespace_sanity/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/tests/test/linker_namespace_sanity/successful_test.py (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/tests/test/successful_test/__init__.py (100%) rename test/{integration_tests => integration}/resources/test_containers/successful/tests/test/successful_test/successful_test.py (100%) rename test/{integration_tests => integration}/test_ci_build.py (100%) rename test/{integration_tests => integration}/test_ci_export.py (100%) rename test/{integration_tests => integration}/test_ci_prepare.py (100%) rename test/{integration_tests => integration}/test_ci_push.py (100%) rename test/{integration_tests => integration}/test_ci_security_scan.py (100%) rename test/{integration_tests => integration}/test_ci_test.py (100%) 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 index 27f33dd..7954696 100644 --- a/exasol_script_languages_container_ci/lib/config/config_data_model.py +++ b/exasol_script_languages_container_ci/lib/config/config_data_model.py @@ -5,17 +5,14 @@ from typing import List -from pydantic import ( - BaseModel, - Extra, -) +from pydantic import BaseModel, Extra class Ignore(BaseModel): class Config: extra = Extra.forbid - paths: list[str] + paths: List[str] class Build(BaseModel): diff --git a/pyproject.toml b/pyproject.toml index 7d44914..ec92f50 100644 --- 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 index c00a48a..ccc7196 100644 --- 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 b/test/contract/__init__.py similarity index 100% rename from test/contract_tests/__init__.py rename to test/contract/__init__.py diff --git a/test/contract_tests/test_ci_test.py b/test/contract/test_ci_test.py similarity index 100% rename from test/contract_tests/test_ci_test.py rename to test/contract/test_ci_test.py diff --git a/test/integration_tests/__init__.py b/test/integration/__init__.py similarity index 100% rename from test/integration_tests/__init__.py rename to test/integration/__init__.py diff --git a/test/integration_tests/resources/__init__.py b/test/integration/resources/__init__.py similarity index 100% rename from test/integration_tests/resources/__init__.py rename to test/integration/resources/__init__.py diff --git a/test/integration_tests/resources/flavors/__init__.py b/test/integration/resources/flavors/__init__.py similarity index 100% rename from test/integration_tests/resources/flavors/__init__.py rename to test/integration/resources/flavors/__init__.py diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/__init__.py b/test/integration/resources/flavors/failing_run_db_test/__init__.py similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/__init__.py rename to test/integration/resources/flavors/failing_run_db_test/__init__.py diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/__init__.py b/test/integration/resources/flavors/failing_run_db_test/flavor_base/__init__.py similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/__init__.py rename to test/integration/resources/flavors/failing_run_db_test/flavor_base/__init__.py diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/base_test_build_run/Dockerfile b/test/integration/resources/flavors/failing_run_db_test/flavor_base/base_test_build_run/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/base_test_build_run/Dockerfile rename to test/integration/resources/flavors/failing_run_db_test/flavor_base/base_test_build_run/Dockerfile diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/build_steps.py b/test/integration/resources/flavors/failing_run_db_test/flavor_base/build_steps.py similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/build_steps.py rename to test/integration/resources/flavors/failing_run_db_test/flavor_base/build_steps.py diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/flavor_test_build_run/Dockerfile b/test/integration/resources/flavors/failing_run_db_test/flavor_base/flavor_test_build_run/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/flavor_test_build_run/Dockerfile rename to test/integration/resources/flavors/failing_run_db_test/flavor_base/flavor_test_build_run/Dockerfile diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/language_definition b/test/integration/resources/flavors/failing_run_db_test/flavor_base/language_definition similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/language_definition rename to test/integration/resources/flavors/failing_run_db_test/flavor_base/language_definition diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/release/Dockerfile b/test/integration/resources/flavors/failing_run_db_test/flavor_base/release/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/release/Dockerfile rename to test/integration/resources/flavors/failing_run_db_test/flavor_base/release/Dockerfile diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/security_scan/Dockerfile b/test/integration/resources/flavors/failing_run_db_test/flavor_base/security_scan/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/security_scan/Dockerfile rename to test/integration/resources/flavors/failing_run_db_test/flavor_base/security_scan/Dockerfile diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/security_scan/test.sh b/test/integration/resources/flavors/failing_run_db_test/flavor_base/security_scan/test.sh similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/security_scan/test.sh rename to test/integration/resources/flavors/failing_run_db_test/flavor_base/security_scan/test.sh diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/testconfig b/test/integration/resources/flavors/failing_run_db_test/flavor_base/testconfig similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/testconfig rename to test/integration/resources/flavors/failing_run_db_test/flavor_base/testconfig diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_customization/Dockerfile b/test/integration/resources/flavors/failing_run_db_test/flavor_customization/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_run_db_test/flavor_customization/Dockerfile rename to test/integration/resources/flavors/failing_run_db_test/flavor_customization/Dockerfile diff --git a/test/integration_tests/resources/flavors/failing_security_scan/__init__.py b/test/integration/resources/flavors/failing_security_scan/__init__.py similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/__init__.py rename to test/integration/resources/flavors/failing_security_scan/__init__.py diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/__init__.py b/test/integration/resources/flavors/failing_security_scan/flavor_base/__init__.py similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_base/__init__.py rename to test/integration/resources/flavors/failing_security_scan/flavor_base/__init__.py diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/base_test_build_run/Dockerfile b/test/integration/resources/flavors/failing_security_scan/flavor_base/base_test_build_run/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_base/base_test_build_run/Dockerfile rename to test/integration/resources/flavors/failing_security_scan/flavor_base/base_test_build_run/Dockerfile diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/build_steps.py b/test/integration/resources/flavors/failing_security_scan/flavor_base/build_steps.py similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_base/build_steps.py rename to test/integration/resources/flavors/failing_security_scan/flavor_base/build_steps.py diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/flavor_test_build_run/Dockerfile b/test/integration/resources/flavors/failing_security_scan/flavor_base/flavor_test_build_run/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_base/flavor_test_build_run/Dockerfile rename to test/integration/resources/flavors/failing_security_scan/flavor_base/flavor_test_build_run/Dockerfile diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/language_definition b/test/integration/resources/flavors/failing_security_scan/flavor_base/language_definition similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_base/language_definition rename to test/integration/resources/flavors/failing_security_scan/flavor_base/language_definition diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/release/Dockerfile b/test/integration/resources/flavors/failing_security_scan/flavor_base/release/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_base/release/Dockerfile rename to test/integration/resources/flavors/failing_security_scan/flavor_base/release/Dockerfile diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/security_scan/Dockerfile b/test/integration/resources/flavors/failing_security_scan/flavor_base/security_scan/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_base/security_scan/Dockerfile rename to test/integration/resources/flavors/failing_security_scan/flavor_base/security_scan/Dockerfile diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/security_scan/test.sh b/test/integration/resources/flavors/failing_security_scan/flavor_base/security_scan/test.sh similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_base/security_scan/test.sh rename to test/integration/resources/flavors/failing_security_scan/flavor_base/security_scan/test.sh diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/testconfig b/test/integration/resources/flavors/failing_security_scan/flavor_base/testconfig similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_base/testconfig rename to test/integration/resources/flavors/failing_security_scan/flavor_base/testconfig diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_customization/Dockerfile b/test/integration/resources/flavors/failing_security_scan/flavor_customization/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/failing_security_scan/flavor_customization/Dockerfile rename to test/integration/resources/flavors/failing_security_scan/flavor_customization/Dockerfile diff --git a/test/integration_tests/resources/flavors/successful/__init__.py b/test/integration/resources/flavors/successful/__init__.py similarity index 100% rename from test/integration_tests/resources/flavors/successful/__init__.py rename to test/integration/resources/flavors/successful/__init__.py diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/__init__.py b/test/integration/resources/flavors/successful/flavor_base/__init__.py similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_base/__init__.py rename to test/integration/resources/flavors/successful/flavor_base/__init__.py diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/base_test_build_run/Dockerfile b/test/integration/resources/flavors/successful/flavor_base/base_test_build_run/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_base/base_test_build_run/Dockerfile rename to test/integration/resources/flavors/successful/flavor_base/base_test_build_run/Dockerfile diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/build_steps.py b/test/integration/resources/flavors/successful/flavor_base/build_steps.py similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_base/build_steps.py rename to test/integration/resources/flavors/successful/flavor_base/build_steps.py diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/flavor_test_build_run/Dockerfile b/test/integration/resources/flavors/successful/flavor_base/flavor_test_build_run/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_base/flavor_test_build_run/Dockerfile rename to test/integration/resources/flavors/successful/flavor_base/flavor_test_build_run/Dockerfile diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/language_definition b/test/integration/resources/flavors/successful/flavor_base/language_definition similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_base/language_definition rename to test/integration/resources/flavors/successful/flavor_base/language_definition diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/release/Dockerfile b/test/integration/resources/flavors/successful/flavor_base/release/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_base/release/Dockerfile rename to test/integration/resources/flavors/successful/flavor_base/release/Dockerfile diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/security_scan/Dockerfile b/test/integration/resources/flavors/successful/flavor_base/security_scan/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_base/security_scan/Dockerfile rename to test/integration/resources/flavors/successful/flavor_base/security_scan/Dockerfile diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/security_scan/test.sh b/test/integration/resources/flavors/successful/flavor_base/security_scan/test.sh similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_base/security_scan/test.sh rename to test/integration/resources/flavors/successful/flavor_base/security_scan/test.sh diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/testconfig b/test/integration/resources/flavors/successful/flavor_base/testconfig similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_base/testconfig rename to test/integration/resources/flavors/successful/flavor_base/testconfig diff --git a/test/integration_tests/resources/flavors/successful/flavor_customization/Dockerfile b/test/integration/resources/flavors/successful/flavor_customization/Dockerfile similarity index 100% rename from test/integration_tests/resources/flavors/successful/flavor_customization/Dockerfile rename to test/integration/resources/flavors/successful/flavor_customization/Dockerfile diff --git a/test/integration_tests/resources/test_containers/__init__.py b/test/integration/resources/test_containers/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/__init__.py rename to test/integration/resources/test_containers/__init__.py diff --git a/test/integration_tests/resources/test_containers/failing/__init__.py b/test/integration/resources/test_containers/failing/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/failing/__init__.py rename to test/integration/resources/test_containers/failing/__init__.py diff --git a/test/integration_tests/resources/test_containers/failing/build/Dockerfile b/test/integration/resources/test_containers/failing/build/Dockerfile similarity index 100% rename from test/integration_tests/resources/test_containers/failing/build/Dockerfile rename to test/integration/resources/test_containers/failing/build/Dockerfile diff --git a/test/integration_tests/resources/test_containers/failing/build/deps/01_nodoc b/test/integration/resources/test_containers/failing/build/deps/01_nodoc similarity index 100% rename from test/integration_tests/resources/test_containers/failing/build/deps/01_nodoc rename to test/integration/resources/test_containers/failing/build/deps/01_nodoc diff --git a/test/integration_tests/resources/test_containers/failing/build/deps/requirements.txt b/test/integration/resources/test_containers/failing/build/deps/requirements.txt similarity index 100% rename from test/integration_tests/resources/test_containers/failing/build/deps/requirements.txt rename to test/integration/resources/test_containers/failing/build/deps/requirements.txt diff --git a/test/integration_tests/resources/test_containers/failing/test_data/enginedb_small/import.sql b/test/integration/resources/test_containers/failing/test_data/enginedb_small/import.sql similarity index 100% rename from test/integration_tests/resources/test_containers/failing/test_data/enginedb_small/import.sql rename to test/integration/resources/test_containers/failing/test_data/enginedb_small/import.sql diff --git a/test/integration_tests/resources/test_containers/failing/tests/__init__.py b/test/integration/resources/test_containers/failing/tests/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/failing/tests/__init__.py rename to test/integration/resources/test_containers/failing/tests/__init__.py diff --git a/test/integration_tests/resources/test_containers/failing/tests/test/__init__.py b/test/integration/resources/test_containers/failing/tests/test/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/failing/tests/test/__init__.py rename to test/integration/resources/test_containers/failing/tests/test/__init__.py diff --git a/test/integration_tests/resources/test_containers/failing/tests/test/failing_test/__init__.py b/test/integration/resources/test_containers/failing/tests/test/failing_test/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/failing/tests/test/failing_test/__init__.py rename to test/integration/resources/test_containers/failing/tests/test/failing_test/__init__.py diff --git a/test/integration_tests/resources/test_containers/failing/tests/test/failing_test/failing_test.py b/test/integration/resources/test_containers/failing/tests/test/failing_test/failing_test.py similarity index 100% rename from test/integration_tests/resources/test_containers/failing/tests/test/failing_test/failing_test.py rename to test/integration/resources/test_containers/failing/tests/test/failing_test/failing_test.py diff --git a/test/integration_tests/resources/test_containers/failing/tests/test/linker_namespace_sanity/__init__.py b/test/integration/resources/test_containers/failing/tests/test/linker_namespace_sanity/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/failing/tests/test/linker_namespace_sanity/__init__.py rename to test/integration/resources/test_containers/failing/tests/test/linker_namespace_sanity/__init__.py diff --git a/test/integration_tests/resources/test_containers/failing/tests/test/linker_namespace_sanity/failing_test.py b/test/integration/resources/test_containers/failing/tests/test/linker_namespace_sanity/failing_test.py similarity index 100% rename from test/integration_tests/resources/test_containers/failing/tests/test/linker_namespace_sanity/failing_test.py rename to test/integration/resources/test_containers/failing/tests/test/linker_namespace_sanity/failing_test.py diff --git a/test/integration_tests/resources/test_containers/successful/__init__.py b/test/integration/resources/test_containers/successful/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/successful/__init__.py rename to test/integration/resources/test_containers/successful/__init__.py diff --git a/test/integration_tests/resources/test_containers/successful/build/Dockerfile b/test/integration/resources/test_containers/successful/build/Dockerfile similarity index 100% rename from test/integration_tests/resources/test_containers/successful/build/Dockerfile rename to test/integration/resources/test_containers/successful/build/Dockerfile diff --git a/test/integration_tests/resources/test_containers/successful/build/deps/01_nodoc b/test/integration/resources/test_containers/successful/build/deps/01_nodoc similarity index 100% rename from test/integration_tests/resources/test_containers/successful/build/deps/01_nodoc rename to test/integration/resources/test_containers/successful/build/deps/01_nodoc diff --git a/test/integration_tests/resources/test_containers/successful/build/deps/requirements.txt b/test/integration/resources/test_containers/successful/build/deps/requirements.txt similarity index 100% rename from test/integration_tests/resources/test_containers/successful/build/deps/requirements.txt rename to test/integration/resources/test_containers/successful/build/deps/requirements.txt diff --git a/test/integration_tests/resources/test_containers/successful/test_data/enginedb_small/import.sql b/test/integration/resources/test_containers/successful/test_data/enginedb_small/import.sql similarity index 100% rename from test/integration_tests/resources/test_containers/successful/test_data/enginedb_small/import.sql rename to test/integration/resources/test_containers/successful/test_data/enginedb_small/import.sql diff --git a/test/integration_tests/resources/test_containers/successful/tests/__init__.py b/test/integration/resources/test_containers/successful/tests/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/successful/tests/__init__.py rename to test/integration/resources/test_containers/successful/tests/__init__.py diff --git a/test/integration_tests/resources/test_containers/successful/tests/test/__init__.py b/test/integration/resources/test_containers/successful/tests/test/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/successful/tests/test/__init__.py rename to test/integration/resources/test_containers/successful/tests/test/__init__.py diff --git a/test/integration_tests/resources/test_containers/successful/tests/test/linker_namespace_sanity/__init__.py b/test/integration/resources/test_containers/successful/tests/test/linker_namespace_sanity/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/successful/tests/test/linker_namespace_sanity/__init__.py rename to test/integration/resources/test_containers/successful/tests/test/linker_namespace_sanity/__init__.py diff --git a/test/integration_tests/resources/test_containers/successful/tests/test/linker_namespace_sanity/successful_test.py b/test/integration/resources/test_containers/successful/tests/test/linker_namespace_sanity/successful_test.py similarity index 100% rename from test/integration_tests/resources/test_containers/successful/tests/test/linker_namespace_sanity/successful_test.py rename to test/integration/resources/test_containers/successful/tests/test/linker_namespace_sanity/successful_test.py diff --git a/test/integration_tests/resources/test_containers/successful/tests/test/successful_test/__init__.py b/test/integration/resources/test_containers/successful/tests/test/successful_test/__init__.py similarity index 100% rename from test/integration_tests/resources/test_containers/successful/tests/test/successful_test/__init__.py rename to test/integration/resources/test_containers/successful/tests/test/successful_test/__init__.py diff --git a/test/integration_tests/resources/test_containers/successful/tests/test/successful_test/successful_test.py b/test/integration/resources/test_containers/successful/tests/test/successful_test/successful_test.py similarity index 100% rename from test/integration_tests/resources/test_containers/successful/tests/test/successful_test/successful_test.py rename to test/integration/resources/test_containers/successful/tests/test/successful_test/successful_test.py diff --git a/test/integration_tests/test_ci_build.py b/test/integration/test_ci_build.py similarity index 100% rename from test/integration_tests/test_ci_build.py rename to test/integration/test_ci_build.py diff --git a/test/integration_tests/test_ci_export.py b/test/integration/test_ci_export.py similarity index 100% rename from test/integration_tests/test_ci_export.py rename to test/integration/test_ci_export.py diff --git a/test/integration_tests/test_ci_prepare.py b/test/integration/test_ci_prepare.py similarity index 100% rename from test/integration_tests/test_ci_prepare.py rename to test/integration/test_ci_prepare.py diff --git a/test/integration_tests/test_ci_push.py b/test/integration/test_ci_push.py similarity index 100% rename from test/integration_tests/test_ci_push.py rename to test/integration/test_ci_push.py diff --git a/test/integration_tests/test_ci_security_scan.py b/test/integration/test_ci_security_scan.py similarity index 100% rename from test/integration_tests/test_ci_security_scan.py rename to test/integration/test_ci_security_scan.py diff --git a/test/integration_tests/test_ci_test.py b/test/integration/test_ci_test.py similarity index 100% rename from test/integration_tests/test_ci_test.py rename to test/integration/test_ci_test.py