Skip to content

Do not overload docker_client fixtures #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
s-t-e-v-e-n-k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not overload docker_client fixtures #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions tests/integration/factories/daemons/container/test_master.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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",
Expand Down
11 changes: 3 additions & 8 deletions tests/integration/factories/daemons/container/test_minion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,16 @@
]


@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)


@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",
Expand Down
Loading