From 72e414becc990ee04326a406b54935bbef3753e8 Mon Sep 17 00:00:00 2001
From: David Murphy < dmurphy@saltstack.com>
Date: Thu, 2 May 2024 16:57:35 -0600
Subject: [PATCH] Updated pkg upgrade and downgrade tests

---
 .../pkg/downgrade/test_salt_downgrade.py      | 12 ++++++------
 .../pytests/pkg/upgrade/test_salt_upgrade.py  | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/tests/pytests/pkg/downgrade/test_salt_downgrade.py b/tests/pytests/pkg/downgrade/test_salt_downgrade.py
index 46800952c85..98bf39b4256 100644
--- a/tests/pytests/pkg/downgrade/test_salt_downgrade.py
+++ b/tests/pytests/pkg/downgrade/test_salt_downgrade.py
@@ -90,7 +90,7 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt):
 
 
 @pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
-def test_salt_downgrade_master(salt_cli, install_salt):
+def test_salt_downgrade_master(install_salt):
     """
     Test an downgrade of Salt Master.
     """
@@ -105,11 +105,12 @@ def test_salt_downgrade_master(salt_cli, install_salt):
         original_py_version = install_salt.package_python_version()
 
     # Verify current install version is setup correctly and works
-    ret = salt_cli.run("--version")
+    bin_file = "salt"
+    ret = install_salt.proc.run(bin_file, "--version")
     assert ret.returncode == 0
-    assert packaging.version.parse(ret.data) == packaging.version.parse(
-        install_salt.artifact_version
-    )
+    assert packaging.version.parse(
+        ret.stdout.strip().split()[1]
+    ) == packaging.version.parse(install_salt.artifact_version)
 
     # Verify there is a running master by getting its PID
     salt_name = "salt"
@@ -131,7 +132,6 @@ def test_salt_downgrade_master(salt_cli, install_salt):
 
     # Downgrade Salt to the previous version and test
     install_salt.install(downgrade=True)
-    bin_file = "salt"
 
     # Verify there is a new running master by getting its PID and comparing it
     # with the PID from before the upgrade
diff --git a/tests/pytests/pkg/upgrade/test_salt_upgrade.py b/tests/pytests/pkg/upgrade/test_salt_upgrade.py
index b3aa8e8d6f1..98f3c4b4f30 100644
--- a/tests/pytests/pkg/upgrade/test_salt_upgrade.py
+++ b/tests/pytests/pkg/upgrade/test_salt_upgrade.py
@@ -87,7 +87,7 @@ def test_salt_upgrade_minion(salt_call_cli, install_salt):
 
 
 @pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
-def test_salt_upgrade_master(salt_cli, install_salt):
+def test_salt_upgrade_master(install_salt):
     """
     Test an upgrade of Salt Master.
     """
@@ -98,11 +98,12 @@ def test_salt_upgrade_master(salt_cli, install_salt):
         original_py_version = install_salt.package_python_version()
 
     # Verify previous install version is setup correctly and works
-    ret = salt_cli.run("--version")
+    bin_file = "salt"
+    ret = install_salt.proc.run(bin_file, "--version")
     assert ret.returncode == 0
-    assert packaging.version.parse(ret.data) < packaging.version.parse(
-        install_salt.artifact_version
-    )
+    assert packaging.version.parse(
+        ret.stdout.strip().split()[1]
+    ) == packaging.version.parse(install_salt.artifact_version)
 
     # Verify there is a running minion by getting its PID
     salt_name = "salt"
@@ -124,11 +125,11 @@ def test_salt_upgrade_master(salt_cli, install_salt):
 
     # Upgrade Salt from previous version and test
     install_salt.install(upgrade=True)
-    ret = salt_cli.run("--version")
+    ret = install_salt.proc.run(bin_file, "--version")
     assert ret.returncode == 0
-    assert packaging.version.parse(ret.data) == packaging.version.parse(
-        install_salt.artifact_version
-    )
+    assert packaging.version.parse(
+        ret.stdout.strip().split()[1]
+    ) == packaging.version.parse(install_salt.artifact_version)
 
     # Verify there is a new running master by getting its PID and comparing it
     # with the PID from before the upgrade