diff --git a/tests/integration_tests/scheduler/test_openpbs_driver.py b/tests/integration_tests/scheduler/test_openpbs_driver.py index 1926472cfa5..a6f987b4d75 100644 --- a/tests/integration_tests/scheduler/test_openpbs_driver.py +++ b/tests/integration_tests/scheduler/test_openpbs_driver.py @@ -6,7 +6,7 @@ from ert.cli.main import ErtCliError from ert.mode_definitions import ENSEMBLE_EXPERIMENT_MODE from ert.scheduler.openpbs_driver import OpenPBSDriver -from tests.integration_tests.run_cli import run_cli +from tests.ui_tests.cli.run_cli import run_cli from .conftest import mock_bin diff --git a/tests/integration_tests/analysis/__init__.py b/tests/ui_tests/__init__.py similarity index 100% rename from tests/integration_tests/analysis/__init__.py rename to tests/ui_tests/__init__.py diff --git a/tests/integration_tests/shared/__init__.py b/tests/ui_tests/cli/__init__.py similarity index 100% rename from tests/integration_tests/shared/__init__.py rename to tests/ui_tests/cli/__init__.py diff --git a/tests/integration_tests/shared/share/__init__.py b/tests/ui_tests/cli/analysis/__init__.py similarity index 100% rename from tests/integration_tests/shared/share/__init__.py rename to tests/ui_tests/cli/analysis/__init__.py diff --git a/tests/integration_tests/analysis/snapshots/test_es_update/test_update_only_using_subset_observations/0/update_log b/tests/ui_tests/cli/analysis/snapshots/test_es_update/test_update_only_using_subset_observations/0/update_log similarity index 100% rename from tests/integration_tests/analysis/snapshots/test_es_update/test_update_only_using_subset_observations/0/update_log rename to tests/ui_tests/cli/analysis/snapshots/test_es_update/test_update_only_using_subset_observations/0/update_log diff --git a/tests/integration_tests/analysis/test_adaptive_localization.py b/tests/ui_tests/cli/analysis/test_adaptive_localization.py similarity index 99% rename from tests/integration_tests/analysis/test_adaptive_localization.py rename to tests/ui_tests/cli/analysis/test_adaptive_localization.py index 45af7253e4c..70bfa515dd4 100644 --- a/tests/integration_tests/analysis/test_adaptive_localization.py +++ b/tests/ui_tests/cli/analysis/test_adaptive_localization.py @@ -9,7 +9,7 @@ from ert.storage import open_storage random_seed_line = "RANDOM_SEED 1234\n\n" -from tests.integration_tests.run_cli import run_cli +from tests.ui_tests.cli.run_cli import run_cli def run_cli_ES_with_case(poly_config): diff --git a/tests/integration_tests/analysis/test_es_update.py b/tests/ui_tests/cli/analysis/test_es_update.py similarity index 99% rename from tests/integration_tests/analysis/test_es_update.py rename to tests/ui_tests/cli/analysis/test_es_update.py index faadc9009bf..95610eff59f 100644 --- a/tests/integration_tests/analysis/test_es_update.py +++ b/tests/ui_tests/cli/analysis/test_es_update.py @@ -20,7 +20,7 @@ from ert.mode_definitions import ENSEMBLE_SMOOTHER_MODE from ert.storage import open_storage from ert.storage.realization_storage_state import RealizationStorageState -from tests.integration_tests.run_cli import run_cli +from tests.ui_tests.cli.run_cli import run_cli @pytest.fixture diff --git a/tests/integration_tests/run_cli.py b/tests/ui_tests/cli/run_cli.py similarity index 100% rename from tests/integration_tests/run_cli.py rename to tests/ui_tests/cli/run_cli.py diff --git a/tests/integration_tests/snapshots/test_cli/test_es_mda/es_mda_integration_snapshot b/tests/ui_tests/cli/snapshots/test_cli/test_es_mda/es_mda_integration_snapshot similarity index 100% rename from tests/integration_tests/snapshots/test_cli/test_es_mda/es_mda_integration_snapshot rename to tests/ui_tests/cli/snapshots/test_cli/test_es_mda/es_mda_integration_snapshot diff --git a/tests/integration_tests/snapshots/test_cli/test_es_mda/using_job_queue/es_mda_integration_snapshot b/tests/ui_tests/cli/snapshots/test_cli/test_es_mda/using_job_queue/es_mda_integration_snapshot similarity index 100% rename from tests/integration_tests/snapshots/test_cli/test_es_mda/using_job_queue/es_mda_integration_snapshot rename to tests/ui_tests/cli/snapshots/test_cli/test_es_mda/using_job_queue/es_mda_integration_snapshot diff --git a/tests/integration_tests/snapshots/test_cli/test_es_mda/using_scheduler/es_mda_integration_snapshot b/tests/ui_tests/cli/snapshots/test_cli/test_es_mda/using_scheduler/es_mda_integration_snapshot similarity index 100% rename from tests/integration_tests/snapshots/test_cli/test_es_mda/using_scheduler/es_mda_integration_snapshot rename to tests/ui_tests/cli/snapshots/test_cli/test_es_mda/using_scheduler/es_mda_integration_snapshot diff --git a/tests/integration_tests/test_cli.py b/tests/ui_tests/cli/test_cli.py similarity index 100% rename from tests/integration_tests/test_cli.py rename to tests/ui_tests/cli/test_cli.py diff --git a/tests/integration_tests/storage/test_field_parameter.py b/tests/ui_tests/cli/test_field_parameter.py similarity index 99% rename from tests/integration_tests/storage/test_field_parameter.py rename to tests/ui_tests/cli/test_field_parameter.py index 77530fb4286..64adebe7d5a 100644 --- a/tests/integration_tests/storage/test_field_parameter.py +++ b/tests/ui_tests/cli/test_field_parameter.py @@ -11,7 +11,8 @@ from ert.config import ErtConfig from ert.mode_definitions import ENSEMBLE_SMOOTHER_MODE from ert.storage import open_storage -from tests.integration_tests.run_cli import run_cli + +from .run_cli import run_cli @pytest.mark.integration_test diff --git a/tests/integration_tests/test_parameter_example.py b/tests/ui_tests/cli/test_parameter_example.py similarity index 100% rename from tests/integration_tests/test_parameter_example.py rename to tests/ui_tests/cli/test_parameter_example.py diff --git a/tests/integration_tests/storage/test_parameter_sample_types.py b/tests/ui_tests/cli/test_parameter_sample_types.py similarity index 99% rename from tests/integration_tests/storage/test_parameter_sample_types.py rename to tests/ui_tests/cli/test_parameter_sample_types.py index 525e98241ae..2de7cb6a247 100644 --- a/tests/integration_tests/storage/test_parameter_sample_types.py +++ b/tests/ui_tests/cli/test_parameter_sample_types.py @@ -11,7 +11,8 @@ from ert.libres_facade import LibresFacade from ert.mode_definitions import ENSEMBLE_SMOOTHER_MODE from ert.storage import open_storage -from tests.integration_tests.run_cli import run_cli + +from .run_cli import run_cli def load_from_forward_model(ert_config, ensemble): diff --git a/tests/integration_tests/shared/share/test_shell.py b/tests/ui_tests/cli/test_shell.py similarity index 97% rename from tests/integration_tests/shared/share/test_shell.py rename to tests/ui_tests/cli/test_shell.py index 03a9b8035b2..e30418ada89 100644 --- a/tests/integration_tests/shared/share/test_shell.py +++ b/tests/ui_tests/cli/test_shell.py @@ -4,7 +4,8 @@ import pytest from ert.plugins import ErtPluginManager -from tests.integration_tests.run_cli import run_cli_with_pm + +from .run_cli import run_cli_with_pm @pytest.mark.integration_test diff --git a/tests/integration_tests/storage/__init__.py b/tests/ui_tests/gui/__init__.py similarity index 100% rename from tests/integration_tests/storage/__init__.py rename to tests/ui_tests/gui/__init__.py diff --git a/tests/unit_tests/gui/tools/test_manage_experiments_tool.py b/tests/unit_tests/gui/tools/test_manage_experiments_tool.py index cad22e6cf8a..7babb225c51 100644 --- a/tests/unit_tests/gui/tools/test_manage_experiments_tool.py +++ b/tests/unit_tests/gui/tools/test_manage_experiments_tool.py @@ -16,7 +16,7 @@ from ert.gui.tools.manage_experiments.storage_widget import StorageWidget from ert.storage import Storage, open_storage from ert.storage.realization_storage_state import RealizationStorageState -from tests.integration_tests.analysis.test_adaptive_localization import ( +from tests.ui_tests.cli.analysis.test_adaptive_localization import ( run_cli_ES_with_case, )