mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Replace @skipIf(not platform.is_darwin(), ...)
usage
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
bf64bf93d9
commit
a222d9b613
3 changed files with 3 additions and 4 deletions
|
@ -5,11 +5,10 @@ import pytest
|
|||
|
||||
import salt.utils.platform
|
||||
from tests.support.case import ModuleCase
|
||||
from tests.support.unit import skipIf
|
||||
|
||||
|
||||
@pytest.mark.windows_whitelisted
|
||||
@skipIf(salt.utils.platform.is_darwin(), "No mtab on Darwin")
|
||||
@pytest.mark.skip_on_darwin(reason="No mtab on Darwin")
|
||||
@pytest.mark.skip_on_freebsd
|
||||
@pytest.mark.skip_on_windows(reason="No mtab on Windows")
|
||||
@pytest.mark.destructive_test
|
||||
|
|
|
@ -4,7 +4,7 @@ from tests.support.case import ModuleCase
|
|||
|
||||
|
||||
@pytest.mark.skip_on_windows(reason="minion is windows")
|
||||
@skipIf(salt.utils.platform.is_darwin(), "locale method is not supported on mac")
|
||||
@pytest.mark.skip_on_darwin(reason="locale method is not supported on mac")
|
||||
@pytest.mark.skip_on_freebsd(
|
||||
reason="locale method is supported only within login classes or environment variables"
|
||||
)
|
||||
|
|
|
@ -196,7 +196,7 @@ def test_blkid(stub_disk_blkid):
|
|||
|
||||
|
||||
@pytest.mark.skip_on_windows(reason="Skip on Windows")
|
||||
@skipIf(salt.utils.platform.is_darwin(), "Skip on Darwin")
|
||||
@pytest.mark.skip_on_darwin(reason="Skip on Darwin")
|
||||
@pytest.mark.skip_on_freebsd
|
||||
def test_blkid_token():
|
||||
run_stdout_mock = MagicMock(return_value={"retcode": 1})
|
||||
|
|
Loading…
Add table
Reference in a new issue