saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix pkg tests on photon

Browse source
This commit is contained in:
Daniel A. Wozniak 2025-01-03 16:29:09 -07:00 • committed by Daniel Wozniak
parent 7167affa28
commit b368da74f0
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/pytests/functional/states/file/test_directory.py
View file

@ -60,6 +60,12 @@ def test_directory_symlink_dry_run(file, tmp_path):
assert ret.result is True
def _kernel_check(lookfor):
with salt.utils.files.fopen("/proc/version") as fp:
versioninfo = fp.read().lower()
return lookfor in versioninfo
@pytest.mark.skip_if_not_root
@pytest.mark.skip_on_windows(reason="Windows does not report any file modes. Skipping.")
def test_directory_max_depth(file, tmp_path):
@ -83,7 +89,10 @@ def test_directory_max_depth(file, tmp_path):
initial_mode = "0111"
changed_mode = "0555"
if salt.utils.platform.is_photonos():
# Check that we are not just running photon but the kernel matches. This
# check should fail if we are in a photon container running on and os other
# than photon.
if salt.utils.platform.is_photonos() and _kernel_check("photon"):
initial_modes = {
0: {sub: "0750", subsub: "0110"},
1: {sub: "0110", subsub: "0110"},

4
tests/pytests/functional/states/test_pkg.py
View file

@ -67,9 +67,9 @@ def PKG_TARGETS(grains):
elif grains["os_family"] == "RedHat":
if grains["os"] == "VMware Photon OS":
if grains["osmajorrelease"] >= 5:
_PKG_TARGETS = ["wget", "zsh"]
_PKG_TARGETS = ["ctags", "zsh"]
else:
_PKG_TARGETS = ["wget", "zsh-html"]
_PKG_TARGETS = ["ctags", "zsh-html"]
elif (
grains["os"] in ("CentOS Stream", "Rocky", "AlmaLinux")
and grains["osmajorrelease"] == 9