mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 17:50:20 +00:00
Now that docker is installed on windows golden images, the tests run and fail.
Remove the whitelist marker. Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
bf638dc326
commit
1015d3a1ca
12 changed files with 0 additions and 12 deletions
|
@ -13,7 +13,6 @@ docker = pytest.importorskip("docker")
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
pytestmark = [
|
||||
pytest.mark.windows_whitelisted,
|
||||
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
|
||||
]
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ docker = pytest.importorskip("docker")
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
pytestmark = [
|
||||
pytest.mark.windows_whitelisted,
|
||||
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
|
||||
]
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@ docker = pytest.importorskip("docker")
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
pytestmark = [
|
||||
pytest.mark.windows_whitelisted,
|
||||
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
|
||||
]
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@ log = logging.getLogger(__name__)
|
|||
|
||||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.windows_whitelisted,
|
||||
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
|
||||
]
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ log = logging.getLogger(__name__)
|
|||
|
||||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
|
||||
pytest.mark.skip_if_binaries_missing(
|
||||
"docker", "dockerd", reason="Docker not installed"
|
||||
),
|
||||
|
|
|
@ -16,7 +16,6 @@ pytest.importorskip("docker")
|
|||
|
||||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
|
||||
pytest.mark.skip_if_binaries_missing(
|
||||
"docker", "dockerd", reason="Docker not installed"
|
||||
),
|
||||
|
|
|
@ -16,7 +16,6 @@ pytest.importorskip("docker")
|
|||
|
||||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
|
||||
pytest.mark.skip_if_binaries_missing(
|
||||
"docker", "dockerd", reason="Docker not installed"
|
||||
),
|
||||
|
|
|
@ -15,7 +15,6 @@ pytest.importorskip("docker")
|
|||
|
||||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
|
||||
pytest.mark.skip_if_binaries_missing(
|
||||
"docker", "dockerd", reason="Docker not installed"
|
||||
),
|
||||
|
|
|
@ -15,7 +15,6 @@ pytest.importorskip("docker")
|
|||
|
||||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
|
||||
pytest.mark.skip_if_binaries_missing(
|
||||
"docker", "dockerd", reason="Docker not installed"
|
||||
),
|
||||
|
|
|
@ -15,7 +15,6 @@ pytest.importorskip("docker")
|
|||
|
||||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
|
||||
pytest.mark.skip_if_binaries_missing(
|
||||
"docker", "dockerd", reason="Docker not installed"
|
||||
),
|
||||
|
|
|
@ -12,7 +12,6 @@ docker = pytest.importorskip("docker")
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
pytestmark = [
|
||||
pytest.mark.windows_whitelisted,
|
||||
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
|
||||
]
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ log = logging.getLogger(__name__)
|
|||
|
||||
pytestmark = [
|
||||
pytest.mark.slow_test,
|
||||
pytest.mark.windows_whitelisted,
|
||||
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
|
||||
]
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue