Backing out changes to discover cause of FileNotFoundError messages

This commit is contained in:
David Murphy 2024-06-14 10:11:40 -06:00 committed by Daniel Wozniak
parent 82070dc46d
commit 0a8bc5aeb0
4 changed files with 23 additions and 7 deletions

View file

@ -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 = []

View file

@ -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"
),
),
]

View file

@ -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],

View file

@ -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