diff --git a/noxfile.py b/noxfile.py index 03e059d7..ba8a6b90 100644 --- a/noxfile.py +++ b/noxfile.py @@ -20,10 +20,8 @@ IS_WINDOWS = sys.platform.lower().startswith("win") IS_DARWIN = sys.platform.lower().startswith("darwin") -if IS_WINDOWS: +if IS_WINDOWS or IS_DARWIN: COVERAGE_FAIL_UNDER_PERCENT = 70 -elif IS_DARWIN: - COVERAGE_FAIL_UNDER_PERCENT = 75 else: COVERAGE_FAIL_UNDER_PERCENT = 80 diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py index aea00dd4..e6207210 100644 --- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py +++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py @@ -10,6 +10,7 @@ pytestmark = [ pytest.mark.skip_on_darwin, pytest.mark.skip_on_windows, + pytest.mark.skip_on_salt_system_service, ] diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py index 5a99125c..b30fb8a2 100644 --- a/tests/integration/factories/daemons/sshd/test_sshd.py +++ b/tests/integration/factories/daemons/sshd/test_sshd.py @@ -3,6 +3,12 @@ import pytest +pytestmark = [ + pytest.mark.skip_on_darwin, + pytest.mark.skip_on_windows, + pytest.mark.skip_on_salt_system_service, +] + @pytest.fixture(scope="module") @pytest.mark.skip_if_binaries_missing("sshd", "ssh-keygen")