Merge pull request #66817 from dwoz/testskip

[3006.x] Skip pkg tests that need new golden image
This commit is contained in:
Daniel Wozniak 2024-08-20 00:23:11 -07:00 committed by GitHub
commit a763096359
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -249,10 +249,13 @@ def test_pkg_002_installed_with_version(PKG_TARGETS, states, latest_version):
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_003_installed_multipkg(caplog, PKG_TARGETS, modules, states):
def test_pkg_003_installed_multipkg(caplog, PKG_TARGETS, modules, states, grains):
"""
This is a destructive test as it installs and then removes two packages
"""
if grains["os_family"] == "Arch":
pytest.skip("Arch needs refresh_db logic added to golden image")
version = modules.pkg.version(*PKG_TARGETS)
# If this assert fails, we need to find new targets, this test needs to
@ -274,10 +277,14 @@ def test_pkg_003_installed_multipkg(caplog, PKG_TARGETS, modules, states):
@pytest.mark.usefixtures("VERSION_SPEC_SUPPORTED")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_004_installed_multipkg_with_version(PKG_TARGETS, latest_version, states):
def test_pkg_004_installed_multipkg_with_version(
PKG_TARGETS, latest_version, states, grains
):
"""
This is a destructive test as it installs and then removes two packages
"""
if grains["os_family"] == "Arch":
pytest.skip("Arch needs refresh_db logic added to golden image")
version = latest_version(PKG_TARGETS[0])
# If this assert fails, we need to find new targets, this test needs to
@ -886,6 +893,7 @@ def test_pkg_cap_003_installed_multipkg_with_version(
latest_version,
modules,
states,
grains,
):
"""
This is a destructive test as it installs and then removes two packages