From 4ee0f9410b23d787d75e9ab1b39f393c349d89d9 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 27 Aug 2024 09:45:46 -0600
Subject: [PATCH] Rearrangment of test parameters

---
 tests/pytests/pkg/integration/test_salt_api.py  |  2 +-
 tests/pytests/pkg/integration/test_salt_ufw.py  |  4 ++--
 tests/pytests/pkg/integration/test_salt_user.py | 10 +++++++---
 tests/pytests/pkg/integration/test_version.py   |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/pytests/pkg/integration/test_salt_api.py b/tests/pytests/pkg/integration/test_salt_api.py
index f01e7c5fd7c..ce9ffce8656 100644
--- a/tests/pytests/pkg/integration/test_salt_api.py
+++ b/tests/pytests/pkg/integration/test_salt_api.py
@@ -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
     """
diff --git a/tests/pytests/pkg/integration/test_salt_ufw.py b/tests/pytests/pkg/integration/test_salt_ufw.py
index 0e0471aebf2..6c86e0a3339 100644
--- a/tests/pytests/pkg/integration/test_salt_ufw.py
+++ b/tests/pytests/pkg/integration/test_salt_ufw.py
@@ -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
     """
diff --git a/tests/pytests/pkg/integration/test_salt_user.py b/tests/pytests/pkg/integration/test_salt_user.py
index 07c29837e90..70a08742970 100644
--- a/tests/pytests/pkg/integration/test_salt_user.py
+++ b/tests/pytests/pkg/integration/test_salt_user.py
@@ -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,
 ):
     """
diff --git a/tests/pytests/pkg/integration/test_version.py b/tests/pytests/pkg/integration/test_version.py
index 1402a4ef79f..01225dd2e6b 100644
--- a/tests/pytests/pkg/integration/test_version.py
+++ b/tests/pytests/pkg/integration/test_version.py
@@ -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
     """