From 0a8bc5aeb0643a023229d440f3304791c4bcf74a Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 14 Jun 2024 10:11:40 -0600
Subject: [PATCH] Backing out changes to discover cause of FileNotFoundError
 messages

---
 .../pytests/pkg/integration/test_enabled_disabled.py  |  4 ++--
 tests/pytests/pkg/integration/test_salt_user.py       |  7 +++++++
 tests/pytests/pkg/integration/test_version.py         |  8 ++++----
 tests/pytests/pkg/upgrade/test_systemd_permissions.py | 11 ++++++++++-
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/tests/pytests/pkg/integration/test_enabled_disabled.py b/tests/pytests/pkg/integration/test_enabled_disabled.py
index ae6cf51362b..6074dff1207 100644
--- a/tests/pytests/pkg/integration/test_enabled_disabled.py
+++ b/tests/pytests/pkg/integration/test_enabled_disabled.py
@@ -7,8 +7,8 @@ def test_services(install_salt, salt_call_cli):
     """
     Check if Services are enabled/disabled
     """
-    if not install_salt.upgrade:
-        install_salt.install()
+    ## DGM if not install_salt.upgrade:
+    ## DGM     install_salt.install()
 
     services_disabled = []
     services_enabled = []
diff --git a/tests/pytests/pkg/integration/test_salt_user.py b/tests/pytests/pkg/integration/test_salt_user.py
index 076a43963ec..61508ca993b 100644
--- a/tests/pytests/pkg/integration/test_salt_user.py
+++ b/tests/pytests/pkg/integration/test_salt_user.py
@@ -10,6 +10,13 @@ from saltfactories.utils.tempfiles import temp_directory
 
 pytestmark = [
     pytest.mark.skip_unless_on_linux,
+    pytest.mark.skipif(
+        True,
+        reason=(
+            "Package permissions are getting reworked in "
+            "https://github.com/saltstack/salt/pull/66218"
+        ),
+    ),
 ]
 
 
diff --git a/tests/pytests/pkg/integration/test_version.py b/tests/pytests/pkg/integration/test_version.py
index d59377c31d6..a84527cbe42 100644
--- a/tests/pytests/pkg/integration/test_version.py
+++ b/tests/pytests/pkg/integration/test_version.py
@@ -11,8 +11,8 @@ def test_salt_version(version, install_salt):
     """
     Test version output from salt --version
     """
-    if install_salt.upgrade:
-        install_salt.install()
+    ## DGM if install_salt.upgrade:
+    ## DGM     install_salt.install()
 
     test_bin = os.path.join(*install_salt.binary_paths["salt"])
     ret = install_salt.proc.run(test_bin, "--version")
@@ -74,8 +74,8 @@ def test_compare_versions(version, binary, install_salt):
     Test compare versions
     """
     if binary in install_salt.binary_paths:
-        if install_salt.upgrade:
-            install_salt.install()
+        ## DGM if install_salt.upgrade:
+        ## DGM     install_salt.install()
 
         ret = install_salt.proc.run(
             *install_salt.binary_paths[binary],
diff --git a/tests/pytests/pkg/upgrade/test_systemd_permissions.py b/tests/pytests/pkg/upgrade/test_systemd_permissions.py
index 0a7bf6c158a..33ccb635a38 100644
--- a/tests/pytests/pkg/upgrade/test_systemd_permissions.py
+++ b/tests/pytests/pkg/upgrade/test_systemd_permissions.py
@@ -2,7 +2,16 @@ import time
 
 import pytest
 
-pytestmark = [pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")]
+pytestmark = [
+    pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family"),
+    pytest.mark.skipif(
+        True,
+        reason=(
+            "Package permissions are getting reworked in "
+            "https://github.com/saltstack/salt/pull/66218"
+        ),
+    ),
+]
 
 
 @pytest.fixture