From 0e501f0886d388b0acedf02cb4fd79c5be9905e4 Mon Sep 17 00:00:00 2001 From: Anastasiia Shevchuk Date: Wed, 29 Jan 2025 15:06:29 +0100 Subject: [PATCH] testlib_refactor: move 'base_configuration_scenario' module into 'testlib/unit' The idea is to have all unit test helpers stored in one folder. Jira ticket: CMK-21342 Change-Id: I8abb60e1591c5cb295d42ab04b14c55ff44dce85 --- tests/testlib/{ => unit}/base_configuration_scenario.py | 0 tests/unit/cmk/base/server_side_calls/test_macro_support_doc.py | 2 +- tests/unit/cmk/base/sources/test_data_sources.py | 2 +- tests/unit/cmk/base/test_automations_check_mk.py | 2 +- tests/unit/cmk/base/test_check_table.py | 2 +- tests/unit/cmk/base/test_checkers.py | 2 +- tests/unit/cmk/base/test_config.py | 2 +- tests/unit/cmk/base/test_core_config.py | 2 +- tests/unit/cmk/base/test_core_nagios.py | 2 +- tests/unit/cmk/base/test_discovery.py | 2 +- tests/unit/cmk/base/test_ip_lookup.py | 2 +- tests/unit/cmk/base/test_mgmt_board.py | 2 +- tests/unit/cmk/base/test_modes_check_mk.py | 2 +- tests/unit/cmk/base/test_unit_automations.py | 2 +- tests/unit/cmk/checkengine/test_autochecks.py | 2 +- tests/unit/cmk/snmplib/test_table.py | 2 +- tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py | 2 +- tests/unit/cmk/utils/rulesets/test_tuple_rulesets.py | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename tests/testlib/{ => unit}/base_configuration_scenario.py (100%) diff --git a/tests/testlib/base_configuration_scenario.py b/tests/testlib/unit/base_configuration_scenario.py similarity index 100% rename from tests/testlib/base_configuration_scenario.py rename to tests/testlib/unit/base_configuration_scenario.py diff --git a/tests/unit/cmk/base/server_side_calls/test_macro_support_doc.py b/tests/unit/cmk/base/server_side_calls/test_macro_support_doc.py index c2dcaaa1a71..6171dff854a 100644 --- a/tests/unit/cmk/base/server_side_calls/test_macro_support_doc.py +++ b/tests/unit/cmk/base/server_side_calls/test_macro_support_doc.py @@ -12,7 +12,7 @@ import pytest -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario import cmk.ccc.version as cmk_version diff --git a/tests/unit/cmk/base/sources/test_data_sources.py b/tests/unit/cmk/base/sources/test_data_sources.py index b0922830bdf..a8b9898bf39 100644 --- a/tests/unit/cmk/base/sources/test_data_sources.py +++ b/tests/unit/cmk/base/sources/test_data_sources.py @@ -8,7 +8,7 @@ import pytest -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario from cmk.ccc.exceptions import OnError diff --git a/tests/unit/cmk/base/test_automations_check_mk.py b/tests/unit/cmk/base/test_automations_check_mk.py index fd852866bfe..e9a20bf4c9c 100644 --- a/tests/unit/cmk/base/test_automations_check_mk.py +++ b/tests/unit/cmk/base/test_automations_check_mk.py @@ -7,7 +7,7 @@ import pytest -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario import cmk.ccc.debug diff --git a/tests/unit/cmk/base/test_check_table.py b/tests/unit/cmk/base/test_check_table.py index 3157529fa3a..bb768f5886f 100644 --- a/tests/unit/cmk/base/test_check_table.py +++ b/tests/unit/cmk/base/test_check_table.py @@ -10,7 +10,7 @@ from pytest import MonkeyPatch # No stub file -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario from cmk.utils.hostaddress import HostName from cmk.utils.rulesets import RuleSetName diff --git a/tests/unit/cmk/base/test_checkers.py b/tests/unit/cmk/base/test_checkers.py index 67a6c3a99e3..5cdc4ba2d5c 100644 --- a/tests/unit/cmk/base/test_checkers.py +++ b/tests/unit/cmk/base/test_checkers.py @@ -11,7 +11,7 @@ import pytest from pytest import MonkeyPatch -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario from cmk.utils.hostaddress import HostName from cmk.utils.servicename import ServiceName diff --git a/tests/unit/cmk/base/test_config.py b/tests/unit/cmk/base/test_config.py index c7cd1319b13..9ebecd5069f 100644 --- a/tests/unit/cmk/base/test_config.py +++ b/tests/unit/cmk/base/test_config.py @@ -15,7 +15,7 @@ import pytest from pytest import MonkeyPatch -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario import cmk.ccc.debug import cmk.ccc.version as cmk_version diff --git a/tests/unit/cmk/base/test_core_config.py b/tests/unit/cmk/base/test_core_config.py index c7dfb0a06dd..8cb18f730eb 100644 --- a/tests/unit/cmk/base/test_core_config.py +++ b/tests/unit/cmk/base/test_core_config.py @@ -11,7 +11,7 @@ import pytest from pytest import MonkeyPatch -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario import cmk.ccc.version as cmk_version diff --git a/tests/unit/cmk/base/test_core_nagios.py b/tests/unit/cmk/base/test_core_nagios.py index 8ddbff08e69..f2af72c36d2 100644 --- a/tests/unit/cmk/base/test_core_nagios.py +++ b/tests/unit/cmk/base/test_core_nagios.py @@ -17,7 +17,7 @@ import pytest from pytest import MonkeyPatch -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario import cmk.ccc.debug import cmk.ccc.version as cmk_version diff --git a/tests/unit/cmk/base/test_discovery.py b/tests/unit/cmk/base/test_discovery.py index b70202e148a..1e705c47227 100644 --- a/tests/unit/cmk/base/test_discovery.py +++ b/tests/unit/cmk/base/test_discovery.py @@ -12,7 +12,7 @@ import pytest from pytest import MonkeyPatch -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario from cmk.ccc.exceptions import OnError diff --git a/tests/unit/cmk/base/test_ip_lookup.py b/tests/unit/cmk/base/test_ip_lookup.py index 2d18c4e4ba1..6f834ba384f 100644 --- a/tests/unit/cmk/base/test_ip_lookup.py +++ b/tests/unit/cmk/base/test_ip_lookup.py @@ -11,7 +11,7 @@ import pytest from pytest import MonkeyPatch -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario from cmk.ccc.exceptions import MKIPAddressLookupError diff --git a/tests/unit/cmk/base/test_mgmt_board.py b/tests/unit/cmk/base/test_mgmt_board.py index 803c18ba049..1ccfa3ca233 100644 --- a/tests/unit/cmk/base/test_mgmt_board.py +++ b/tests/unit/cmk/base/test_mgmt_board.py @@ -12,7 +12,7 @@ from pytest import MonkeyPatch # No stub file -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario from cmk.utils.hostaddress import HostName diff --git a/tests/unit/cmk/base/test_modes_check_mk.py b/tests/unit/cmk/base/test_modes_check_mk.py index b0dbf33943d..f1a8fec0641 100644 --- a/tests/unit/cmk/base/test_modes_check_mk.py +++ b/tests/unit/cmk/base/test_modes_check_mk.py @@ -5,7 +5,7 @@ import pytest -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario import cmk.utils.resulttype as result from cmk.utils.hostaddress import HostName diff --git a/tests/unit/cmk/base/test_unit_automations.py b/tests/unit/cmk/base/test_unit_automations.py index 53b24f0aa48..1ce7c4c8255 100644 --- a/tests/unit/cmk/base/test_unit_automations.py +++ b/tests/unit/cmk/base/test_unit_automations.py @@ -6,7 +6,7 @@ from pytest import MonkeyPatch -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario import cmk.ccc.version as cmk_version from cmk.ccc.version import Edition, edition diff --git a/tests/unit/cmk/checkengine/test_autochecks.py b/tests/unit/cmk/checkengine/test_autochecks.py index 8123ba2073e..3d539eb80fd 100644 --- a/tests/unit/cmk/checkengine/test_autochecks.py +++ b/tests/unit/cmk/checkengine/test_autochecks.py @@ -9,7 +9,7 @@ import pytest -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario import cmk.utils.paths from cmk.utils.hostaddress import HostName diff --git a/tests/unit/cmk/snmplib/test_table.py b/tests/unit/cmk/snmplib/test_table.py index 565d9d1f410..10c74904190 100644 --- a/tests/unit/cmk/snmplib/test_table.py +++ b/tests/unit/cmk/snmplib/test_table.py @@ -13,7 +13,7 @@ import pytest from pytest import MonkeyPatch -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario from cmk.ccc.exceptions import MKSNMPError diff --git a/tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py b/tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py index 4a654242df6..1ff2c702fa3 100644 --- a/tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py +++ b/tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py @@ -10,7 +10,7 @@ import pytest from pytest import MonkeyPatch -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario from cmk.utils.hostaddress import HostName from cmk.utils.labels import BuiltinHostLabelsStore diff --git a/tests/unit/cmk/utils/rulesets/test_tuple_rulesets.py b/tests/unit/cmk/utils/rulesets/test_tuple_rulesets.py index 34b475cb515..f117f49dc25 100644 --- a/tests/unit/cmk/utils/rulesets/test_tuple_rulesets.py +++ b/tests/unit/cmk/utils/rulesets/test_tuple_rulesets.py @@ -13,7 +13,7 @@ import pytest -from tests.testlib.base_configuration_scenario import Scenario +from tests.testlib.unit.base_configuration_scenario import Scenario import cmk.ccc.version as cmk_version