saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rearrangment of test parameters

Browse source
This commit is contained in:
David Murphy 2024-08-27 09:45:46 -06:00 • committed by Daniel Wozniak
parent 7be41f56db
commit 4ee0f9410b
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/pytests/pkg/integration/test_salt_api.py
View file

@ -5,7 +5,7 @@ pytestmark = [
]
def test_salt_api(api_request, salt_master, install_salt):
def test_salt_api(api_request, install_salt, salt_master):
"""
Test running a command against the salt api
"""

4
tests/pytests/pkg/integration/test_salt_ufw.py
View file

@ -9,8 +9,8 @@ pytestmark = [
@pytest.fixture
def salt_systemd_setup(
salt_call_cli,
install_salt,
salt_call_cli,
):
"""
Fixture to set systemd for salt packages to enabled and active
@ -31,7 +31,7 @@ def salt_systemd_setup(
@pytest.mark.skip_if_binaries_missing("ufw")
def test_salt_ufw(salt_systemd_setup, salt_call_cli, install_salt):
def test_salt_ufw(salt_systemd_setup, install_salt, salt_call_cli):
"""
Test salt.ufw for Debian/Ubuntu salt-master
"""

10
tests/pytests/pkg/integration/test_salt_user.py
View file

@ -16,8 +16,8 @@ pytestmark = [
@pytest.fixture
def salt_systemd_setup(
salt_call_cli,
install_salt,
salt_call_cli,
):
"""
Fixture to set systemd for salt packages to enabled and active
@ -88,12 +88,16 @@ def pkg_paths_salt_user_exclusions():
return paths
def test_salt_user_master(salt_master, install_salt):
def test_salt_user_master(install_salt, salt_master):
"""
Test the correct user is running the Salt Master
"""
for count in range(0, 30):
if salt_master.is_running():
print(
f"DGM test_salt_user_master, salt_master is_running, count '{count}'",
flush=True,
)
break
else:
time.sleep(2)
@ -221,10 +225,10 @@ def test_pkg_paths(
@pytest.mark.skip_if_binaries_missing("logrotate")
def test_paths_log_rotation(
install_salt,
salt_master,
salt_minion,
salt_call_cli,
install_salt,
pkg_tests_account,
):
"""

2
tests/pytests/pkg/integration/test_version.py
View file

@ -55,7 +55,7 @@ def test_salt_versions_report_master(install_salt):
@pytest.mark.skip_on_windows
def test_salt_versions_report_minion(salt_cli, salt_call_cli, salt_minion, salt_master):
def test_salt_versions_report_minion(salt_cli, salt_call_cli, salt_master, salt_minion):
"""
Test running test.versions_report on minion
"""