diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-27 10:32:22 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-27 10:32:22 +0000 |
commit | d7784aa0c412c80cfcb33a29fd1b2ea69dbe8ab8 (patch) | |
tree | f7d340787b36afcb3b78f2a0875c2c9c8419cdec /testing/util.py | |
parent | Releasing debian version 3.0.4-1. (diff) | |
download | pre-commit-d7784aa0c412c80cfcb33a29fd1b2ea69dbe8ab8.tar.xz pre-commit-d7784aa0c412c80cfcb33a29fd1b2ea69dbe8ab8.zip |
Merging upstream version 3.1.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/util.py')
-rw-r--r-- | testing/util.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/testing/util.py b/testing/util.py index b6c3804..7c68d0e 100644 --- a/testing/util.py +++ b/testing/util.py @@ -6,24 +6,13 @@ import subprocess import pytest -from pre_commit.util import CalledProcessError from pre_commit.util import cmd_output -from pre_commit.util import cmd_output_b from testing.auto_namedtuple import auto_namedtuple TESTING_DIR = os.path.abspath(os.path.dirname(__file__)) -def docker_is_running() -> bool: # pragma: win32 no cover - try: - cmd_output_b('docker', 'ps') - except CalledProcessError: # pragma: no cover - return False - else: - return True - - def get_resource_path(path): return os.path.join(TESTING_DIR, 'resources', path) @@ -41,10 +30,6 @@ def cmd_output_mocked_pre_commit_home( return ret, out.replace('\r\n', '\n'), None -skipif_cant_run_docker = pytest.mark.skipif( - os.name == 'nt' or not docker_is_running(), - reason="Docker isn't running or can't be accessed", -) xfailif_windows = pytest.mark.xfail(os.name == 'nt', reason='windows') |