test docker and docker_image directly

testing/language_helpers.py

@@ -20,9 +20,10 @@ def run_language(
     prefix = Prefix(str(path))
     version = version or language.get_default_version()
 
-    language.install_environment(prefix, version, deps)
-    health_error = language.health_check(prefix, version)
-    assert health_error is None, health_error
+    if language.ENVIRONMENT_DIR is not None:
+        language.install_environment(prefix, version, deps)
+        health_error = language.health_check(prefix, version)
+        assert health_error is None, health_error
     with language.in_env(prefix, version):
         ret, out = language.run_hook(
             prefix,

testing/resources/docker_hooks_repo/.pre-commit-hooks.yaml

@@ -1,17 +0,0 @@
--   id: docker-hook
-    name: Docker test hook
-    entry: echo
-    language: docker
-    files: \.txt$
-
--   id: docker-hook-arg
-    name: Docker test hook
-    entry: echo -n
-    language: docker
-    files: \.txt$
-
--   id: docker-hook-failing
-    name: Docker test hook with nonzero exit code
-    entry: bork
-    language: docker
-    files: \.txt$

testing/resources/docker_hooks_repo/Dockerfile

@@ -1,3 +0,0 @@
-FROM ubuntu:focal
-
-CMD ["echo", "This is overwritten by the .pre-commit-hooks.yaml 'entry'"]

testing/resources/docker_image_hooks_repo/.pre-commit-hooks.yaml

@@ -1,8 +0,0 @@
--   id: echo-entrypoint
-    name: echo (via --entrypoint)
-    language: docker_image
-    entry: --entrypoint echo ubuntu:focal
--   id: echo-cmd
-    name: echo (via cmd)
-    language: docker_image
-    entry: ubuntu:focal echo

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')