Address review comments

pkg/tests/conftest.py

@@ -26,7 +26,7 @@ from tests.support.sminion import create_sminion
 log = logging.getLogger(__name__)
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def version(install_salt):
     """
     get version number from artifact

pkg/tests/downgrade/test_salt_downgrade.py

@@ -1,5 +1,5 @@
+import packaging.version
 import pytest
-from packaging.version import parse
 from pytestskipmarkers.utils import platform
 
 
@@ -10,7 +10,9 @@ def test_salt_downgrade(salt_call_cli, install_salt):
     if not install_salt.downgrade:
         pytest.skip("Not testing a downgrade, do not run")
 
-    is_downgrade_to_relenv = parse(install_salt.prev_version) >= parse("3006.0")
+    is_downgrade_to_relenv = packaging.version.parse(
+        install_salt.prev_version
+    ) >= packaging.version.parse("3006.0")
 
     if is_downgrade_to_relenv:
         original_py_version = install_salt.package_python_version()
@@ -18,7 +20,9 @@ def test_salt_downgrade(salt_call_cli, install_salt):
     # Verify current install version is setup correctly and works
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert parse(ret.data) == parse(install_salt.artifact_version)
+    assert packaging.version.parse(ret.data) == packaging.version.parse(
+        install_salt.artifact_version
+    )
 
     # Test pip install before a downgrade
     dep = "PyGithub==1.56.0"
@@ -41,7 +45,9 @@ def test_salt_downgrade(salt_call_cli, install_salt):
 
     ret = install_salt.proc.run(bin_file, "--version")
     assert ret.returncode == 0
-    assert parse(ret.stdout.strip().split()[1]) < parse(install_salt.artifact_version)
+    assert packaging.version.parse(
+        ret.stdout.strip().split()[1]
+    ) < packaging.version.parse(install_salt.artifact_version)
 
     # Windows does not keep the extras directory around in the same state
     # TODO: Fix this problem in windows installers

pkg/tests/integration/test_multi_minion.py

@@ -2,9 +2,9 @@ import os
 import pathlib
 import subprocess
 
+import packaging.version
 import psutil
 import pytest
-from packaging.version import parse
 
 pytestmark = [
     pytest.mark.skip_unless_on_windows,
@@ -13,7 +13,9 @@ pytestmark = [
 
 @pytest.fixture(autouse=True)
 def skip_on_less_than_3006_1(install_salt):
-    if parse(install_salt.version) <= parse("3006.1"):
+    if packaging.version.parse(install_salt.version) <= packaging.version.parse(
+        "3006.1"
+    ):
         pytest.skip(
             "Multi-minion script only available on versions greater than 3006.1"
         )

pkg/tests/support/helpers.py

@@ -557,15 +557,15 @@ class SaltPkgInstall:
             if downgrade:
                 pref_file = pathlib.Path("/etc", "apt", "preferences.d", "salt.pref")
                 pref_file.parent.mkdir(exist_ok=True)
-                pref_contents = textwrap.dedent(
-                    """\
+                pref_file.write_text(
+                    textwrap.dedent(
+                        """\
                 Package: salt*
                 Pin: origin "repo.saltproject.io"
                 Pin-Priority: 1001
                 """
+                    )
                 )
-                with open(pref_file, "w") as fp:
-                    fp.write(pref_contents)
                 cmd.append("--allow-downgrades")
             env = os.environ.copy()
             env["DEBIAN_FRONTEND"] = "noninteractive"

pkg/tests/upgrade/test_salt_upgrade.py

@@ -1,3 +1,4 @@
+import packaging.version
 import pytest
 
 
@@ -14,7 +15,9 @@ def test_salt_upgrade(salt_call_cli, install_salt):
     # Verify previous install version is setup correctly and works
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert ret.data < install_salt.artifact_version
+    assert packaging.version.parse(ret.data) < packaging.version.parse(
+        install_salt.artifact_version
+    )
 
     # Test pip install before an upgrade
     dep = "PyGithub==1.56.0"
@@ -30,7 +33,9 @@ def test_salt_upgrade(salt_call_cli, install_salt):
     install_salt.install(upgrade=True)
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert ret.data == install_salt.artifact_version
+    assert packaging.version.parse(ret.data) == packaging.version.parse(
+        install_salt.artifact_version
+    )
 
     if install_salt.relenv:
         new_py_version = install_salt.package_python_version()