mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Backing out changes to discover cause of FileNotFoundError messages
This commit is contained in:
parent
82070dc46d
commit
0a8bc5aeb0
4 changed files with 23 additions and 7 deletions
|
@ -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 = []
|
||||
|
|
|
@ -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"
|
||||
),
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
|
|
|
@ -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],
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue