diff --git a/pyproject.toml b/pyproject.toml index 2620673..2a0ae2e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,6 +78,8 @@ tests = [ "pytest>=7.2.0", "pytest-salt-factories>=1.0.0; sys_platform == 'win32'", "pytest-salt-factories[docker]>=1.0.0; sys_platform != 'win32'", + "pytest-subtests", + "python-consul", ] [project.entry-points."salt.loader"] diff --git a/tests/functional/cache/test_consul.py b/tests/functional/cache/test_consul.py index 0fb553e..df24f65 100644 --- a/tests/functional/cache/test_consul.py +++ b/tests/functional/cache/test_consul.py @@ -13,12 +13,6 @@ log = logging.getLogger(__name__) -pytestmark = [ - pytest.mark.skip_on_fips_enabled_platform, - pytest.mark.slow_test, - pytest.mark.skip_if_binaries_missing("dockerd"), -] - def confirm_consul_is_ready(timeout_at, container): sleeptime = 0.1 diff --git a/tests/unit/modules/test_consul.py b/tests/unit/modules/test_consul.py index 76113cc..e09161c 100644 --- a/tests/unit/modules/test_consul.py +++ b/tests/unit/modules/test_consul.py @@ -7,12 +7,13 @@ from unittest.mock import patch import pytest -import salt.modules.consul as consul import salt.utils.http import salt.utils.json import salt.utils.platform from salt.exceptions import SaltInvocationError +from saltext.consul.modules import consul + log = logging.getLogger(__name__) diff --git a/tests/unit/pillar/test_consul.py b/tests/unit/pillar/test_consul.py index 8682dd6..ff46a32 100644 --- a/tests/unit/pillar/test_consul.py +++ b/tests/unit/pillar/test_consul.py @@ -2,7 +2,8 @@ from unittest.mock import patch import pytest -import salt.pillar.consul_pillar as consul_pillar + +from saltext.consul.pillar import consul_pillar pytestmark = [ pytest.mark.skipif(not consul_pillar.consul, reason="python-consul module not installed") diff --git a/tests/unit/states/test_consul.py b/tests/unit/states/test_consul.py index f706eab..fa0d4da 100644 --- a/tests/unit/states/test_consul.py +++ b/tests/unit/states/test_consul.py @@ -7,7 +7,8 @@ from unittest.mock import patch import pytest -import salt.states.consul as consul + +from saltext.consul.states import consul log = logging.getLogger(__name__)