diff --git a/tests/integration/factories/daemons/container/test_master.py b/tests/integration/factories/daemons/container/test_master.py index 8f0a655c..221cb4e5 100644 --- a/tests/integration/factories/daemons/container/test_master.py +++ b/tests/integration/factories/daemons/container/test_master.py @@ -21,14 +21,6 @@ ] -@pytest.fixture(scope="session") -def docker_client(salt_factories, docker_client): - if salt_factories.system_service: # pragma: no cover - msg = "Test should not run against system install of Salt" - raise pytest.skip.Exception(msg, _use_item_location=True) - return docker_client - - @pytest.fixture(scope="module") def minion_id(salt_version): return random_string(f"salt-minion-{salt_version}-", uppercase=False) @@ -43,6 +35,10 @@ def master_id(salt_version): def salt_master( salt_factories, docker_client, docker_network_name, master_id, host_docker_network_ip_address ): + if salt_factories.system_service: # pragma: no cover + msg = "Test should not run against system install of Salt" + raise pytest.skip.Exception(msg, _use_item_location=True) + config_overrides = { "open_mode": True, "user": "root", diff --git a/tests/integration/factories/daemons/container/test_minion.py b/tests/integration/factories/daemons/container/test_minion.py index 89a92feb..dc1909a2 100644 --- a/tests/integration/factories/daemons/container/test_minion.py +++ b/tests/integration/factories/daemons/container/test_minion.py @@ -23,14 +23,6 @@ ] -@pytest.fixture(scope="session") -def docker_client(salt_factories, docker_client): - if salt_factories.system_service: # pragma: no cover - msg = "Test should not run against system install of Salt" - raise pytest.skip.Exception(msg, _use_item_location=True) - return docker_client - - @pytest.fixture def minion_id(salt_version): return random_string(f"salt-minion-{salt_version}-", uppercase=False) @@ -38,6 +30,9 @@ def minion_id(salt_version): @pytest.fixture(scope="module") def salt_master(salt_factories, host_docker_network_ip_address): + if salt_factories.system_service: # pragma: no cover + msg = "Test should not run against system install of Salt" + raise pytest.skip.Exception(msg, _use_item_location=True) config_overrides = { "interface": host_docker_network_ip_address, "log_level_logfile": "quiet",