Skip to content

Commit cb97b8c

Browse files
authored
tests: remove unnecessary check for docker (#19)
* tests: remove unnecessary check for docker * skip docker tests on Windows + GHA
1 parent cdffde1 commit cb97b8c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tests/conftest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@ def scm(tmp_dir: TmpDir) -> Iterator[Git]:
7878
def docker(request: pytest.FixtureRequest):
7979
for cmd in [("docker", "ps"), ("docker-compose", "version")]:
8080
try:
81-
subprocess.call(
82-
" ".join(cmd),
81+
subprocess.check_call(
82+
cmd,
8383
stderr=subprocess.DEVNULL,
8484
stdout=subprocess.DEVNULL,
8585
)
8686
except (subprocess.CalledProcessError, OSError):
8787
pytest.skip(f"no {cmd[0]} installed")
8888

89-
if "CI" in os.environ and sys.platform != "linux":
90-
pytest.skip(f"skip for {sys.platform} in CI")
89+
if "CI" in os.environ and os.name == "nt":
90+
pytest.skip("disabled for Windows on Github Actions")
9191

9292
pytest.importorskip("pytest_docker")
9393
yield request.getfixturevalue("docker_services")

0 commit comments

Comments
 (0)