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 2

Replace @requires_salt_modules with @pytest.mark.requires_salt_modules

Browse source
This commit is contained in:
Pedro Algarvio 2021-01-31 10:12:45 +00:00
parent 1434a5acc2
commit b73e9f2f3a
5 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/integration/modules/test_localemod.py
View file

@ -1,7 +1,6 @@
import pytest
import salt.utils.platform
from tests.support.case import ModuleCase
from tests.support.helpers import requires_salt_modules
from tests.support.unit import skipIf
@ -11,7 +10,7 @@ from tests.support.unit import skipIf
salt.utils.platform.is_freebsd(),
"locale method is supported only within login classes or environment variables",
)
@requires_salt_modules("locale")
@pytest.mark.requires_salt_modules("locale")
@pytest.mark.windows_whitelisted
class LocaleModuleTest(ModuleCase):
def _find_new_locale(self, current_locale):

25
tests/integration/modules/test_pkg.py
View file

@ -8,7 +8,6 @@ import salt.utils.platform
from tests.support.case import ModuleCase
from tests.support.helpers import (
requires_network,
requires_salt_modules,
requires_salt_states,
requires_system_grains,
)
@ -33,13 +32,13 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
cls.pkg = "units"
@pytest.mark.skip_if_not_root
@requires_salt_modules("pkg.refresh_db")
@pytest.mark.requires_salt_modules("pkg.refresh_db")
def setUp(self):
if "refresh" not in self.ctx:
self.run_function("pkg.refresh_db")
self.ctx["refresh"] = True
@requires_salt_modules("pkg.list_pkgs")
@pytest.mark.requires_salt_modules("pkg.list_pkgs")
@pytest.mark.slow_test
def test_list(self):
"""
@ -48,7 +47,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_function("pkg.list_pkgs")
self.assertNotEqual(len(ret.keys()), 0)
@requires_salt_modules("pkg.version_cmp")
@pytest.mark.requires_salt_modules("pkg.version_cmp")
@requires_system_grains
@pytest.mark.slow_test
def test_version_cmp(self, grains):
@ -74,7 +73,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
self.assertEqual(self.run_function(func, gt), 1)
@pytest.mark.destructive_test
@requires_salt_modules("pkg.mod_repo", "pkg.del_repo", "pkg.get_repo")
@pytest.mark.requires_salt_modules("pkg.mod_repo", "pkg.del_repo", "pkg.get_repo")
@requires_network()
@requires_system_grains
@pytest.mark.slow_test
@ -191,7 +190,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
if repo is not None:
self.run_function("pkg.del_repo", [repo])
@requires_salt_modules("pkg.owner")
@pytest.mark.requires_salt_modules("pkg.owner")
def test_owner(self):
"""
test finding the package owning a file
@ -201,7 +200,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
self.assertNotEqual(len(ret), 0)
# Similar to pkg.owner, but for FreeBSD's pkgng
@requires_salt_modules("pkg.which")
@pytest.mark.requires_salt_modules("pkg.which")
def test_which(self):
"""
test finding the package owning a file
@ -211,7 +210,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
self.assertNotEqual(len(ret), 0)
@pytest.mark.destructive_test
@requires_salt_modules("pkg.version", "pkg.install", "pkg.remove")
@pytest.mark.requires_salt_modules("pkg.version", "pkg.install", "pkg.remove")
@requires_network()
@pytest.mark.slow_test
def test_install_remove(self):
@ -239,7 +238,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
test_remove()
@pytest.mark.destructive_test
@requires_salt_modules(
@pytest.mark.requires_salt_modules(
"pkg.hold",
"pkg.unhold",
"pkg.install",
@ -294,7 +293,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
self.assertSaltTrueReturn(ret)
@pytest.mark.destructive_test
@requires_salt_modules("pkg.refresh_db")
@pytest.mark.requires_salt_modules("pkg.refresh_db")
@requires_network()
@requires_system_grains
@pytest.mark.slow_test
@ -327,7 +326,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
self.assertFalse(os.path.isfile(rtag))
@requires_salt_modules("pkg.info_installed")
@pytest.mark.requires_salt_modules("pkg.info_installed")
@requires_system_grains
@pytest.mark.slow_test
def test_pkg_info(self, grains):
@ -359,7 +358,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
@skipIf(True, "Temporary Skip - Causes centos 8 test to fail")
@pytest.mark.destructive_test
@requires_network()
@requires_salt_modules(
@pytest.mark.requires_salt_modules(
"pkg.refresh_db",
"pkg.upgrade",
"pkg.install",
@ -442,7 +441,7 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
salt.utils.platform.is_darwin(),
"The jenkins user is equivalent to root on mac, causing the test to be unrunnable",
)
@requires_salt_modules("pkg.remove", "pkg.latest_version")
@pytest.mark.requires_salt_modules("pkg.remove", "pkg.latest_version")
@requires_salt_states("pkg.removed")
@requires_system_grains
@pytest.mark.slow_test

3
tests/integration/modules/test_rabbitmq.py
View file

@ -1,9 +1,8 @@
import pytest
from tests.support.case import ModuleCase
from tests.support.helpers import requires_salt_modules
@requires_salt_modules("rabbitmq")
@pytest.mark.requires_salt_modules("rabbitmq")
@pytest.mark.windows_whitelisted
@pytest.mark.skip_if_not_root
class RabbitModuleTest(ModuleCase):

3
tests/integration/shell/test_arguments.py
View file

@ -5,10 +5,9 @@
import pytest
import salt.utils.args
from tests.support.case import ModuleCase
from tests.support.helpers import requires_salt_modules
@requires_salt_modules("test.ping", "test.arg")
@pytest.mark.requires_salt_modules("test.ping", "test.arg")
@pytest.mark.windows_whitelisted
class ArgumentTestCase(ModuleCase):
@pytest.mark.slow_test

33
tests/integration/states/test_pkg.py
View file

@ -14,7 +14,6 @@ import salt.utils.platform
from tests.support.case import ModuleCase
from tests.support.helpers import (
not_runs_on,
requires_salt_modules,
requires_salt_states,
requires_system_grains,
runs_on,
@ -117,7 +116,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
else:
raise Exception("Package database locked after 60 seconds, bailing out")
@requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_modules("pkg.version")
@requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_001_installed(self):
@ -207,7 +206,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_state("pkg.removed", name=None, pkgs=self._PKG_TARGETS)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_modules("pkg.version")
@requires_salt_states("pkg.installed", "pkg.removed")
def test_pkg_005_installed_32bit(self):
"""
@ -312,7 +311,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_state("pkg.removed", name=target)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.version", "pkg.info_installed")
@pytest.mark.requires_salt_modules("pkg.version", "pkg.info_installed")
@requires_salt_states("pkg.installed", "pkg.removed")
@runs_on(kernel="linux")
@not_runs_on(os="Amazon")
@ -353,7 +352,9 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_state("pkg.removed", name=target)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.list_pkgs", "pkg.list_upgrades", "pkg.version")
@pytest.mark.requires_salt_modules(
"pkg.list_pkgs", "pkg.list_upgrades", "pkg.version"
)
@requires_salt_states("pkg.latest")
@runs_on(kernel="linux", os_family="Debian")
@pytest.mark.slow_test
@ -409,7 +410,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
"Package {} is already up-to-date".format(target),
)
@requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_modules("pkg.version")
@requires_salt_states("pkg.installed", "pkg.removed")
def test_pkg_012_installed_with_wildcard_version(self):
"""
@ -449,7 +450,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_state("pkg.removed", name=target)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.version", "pkg.latest_version")
@pytest.mark.requires_salt_modules("pkg.version", "pkg.latest_version")
@requires_salt_states("pkg.installed", "pkg.removed")
@runs_on(kernel="linux", os_family=["Debian", "RedHat"])
@pytest.mark.slow_test
@ -483,7 +484,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_state("pkg.removed", name=target)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_modules("pkg.version")
@requires_salt_states("pkg.installed", "pkg.removed")
@runs_on(kernel="linux", os_familiy="RedHat")
def test_pkg_014_installed_missing_release(self):
@ -511,7 +512,9 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_state("pkg.removed", name=target)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.hold", "pkg.unhold", "pkg.version", "pkg.list_pkgs")
@pytest.mark.requires_salt_modules(
"pkg.hold", "pkg.unhold", "pkg.version", "pkg.list_pkgs"
)
@requires_salt_states("pkg.installed", "pkg.removed")
@requires_system_grains
@pytest.mark.slow_test
@ -622,7 +625,9 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_state("pkg.removed", name=target)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.hold", "pkg.unhold", "pkg.version", "pkg.list_pkgs")
@pytest.mark.requires_salt_modules(
"pkg.hold", "pkg.unhold", "pkg.version", "pkg.list_pkgs"
)
@requires_salt_states("pkg.installed", "pkg.removed")
@requires_system_grains
@pytest.mark.slow_test
@ -685,7 +690,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_state("pkg.removed", name=versionlock_pkg)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_modules("pkg.version")
@requires_salt_states("pkg.installed", "pkg.removed")
def test_pkg_cap_001_installed(self):
"""
@ -830,7 +835,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_modules("pkg.version")
@requires_salt_states("pkg.latest", "pkg.removed")
def test_pkg_cap_004_latest(self):
"""
@ -878,7 +883,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
ret = self.run_state("pkg.removed", name=realpkg)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_modules("pkg.version")
@requires_salt_states("pkg.installed", "pkg.removed", "pkg.downloaded")
def test_pkg_cap_005_downloaded(self):
"""
@ -916,7 +921,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
)
self.assertSaltTrueReturn(ret)
@requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_modules("pkg.version")
@requires_salt_states("pkg.installed", "pkg.removed", "pkg.uptodate")
def test_pkg_cap_006_uptodate(self):
"""