Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
lkubb committed Aug 12, 2024
1 parent bcb41c3 commit 4614ca1
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
6 changes: 0 additions & 6 deletions tests/functional/cache/test_consul.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/modules/test_consul.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)


Expand Down
3 changes: 2 additions & 1 deletion tests/unit/pillar/test_consul.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/states/test_consul.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down

0 comments on commit 4614ca1

Please sign in to comment.