mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Skip pkg tests that need new golden image
This commit is contained in:
parent
63958cf7e4
commit
29ffc3ab1d
1 changed files with 10 additions and 2 deletions
|
@ -231,10 +231,13 @@ def test_pkg_002_installed_with_version(PKG_TARGETS, states, latest_version):
|
||||||
|
|
||||||
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
|
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
|
||||||
@pytest.mark.slow_test
|
@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
|
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)
|
version = modules.pkg.version(*PKG_TARGETS)
|
||||||
|
|
||||||
# If this assert fails, we need to find new targets, this test needs to
|
# If this assert fails, we need to find new targets, this test needs to
|
||||||
|
@ -256,10 +259,14 @@ def test_pkg_003_installed_multipkg(caplog, PKG_TARGETS, modules, states):
|
||||||
@pytest.mark.usefixtures("VERSION_SPEC_SUPPORTED")
|
@pytest.mark.usefixtures("VERSION_SPEC_SUPPORTED")
|
||||||
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
|
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
|
||||||
@pytest.mark.slow_test
|
@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
|
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])
|
version = latest_version(PKG_TARGETS[0])
|
||||||
|
|
||||||
# If this assert fails, we need to find new targets, this test needs to
|
# If this assert fails, we need to find new targets, this test needs to
|
||||||
|
@ -868,6 +875,7 @@ def test_pkg_cap_003_installed_multipkg_with_version(
|
||||||
latest_version,
|
latest_version,
|
||||||
modules,
|
modules,
|
||||||
states,
|
states,
|
||||||
|
grains,
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
This is a destructive test as it installs and then removes two packages
|
This is a destructive test as it installs and then removes two packages
|
||||||
|
|
Loading…
Add table
Reference in a new issue