use run_language for repository_test

asottile · asottile · commit d23990cc8b3b · 2023-02-20T22:21:31.000-05:00
diff --git a/testing/language_helpers.py b/testing/language_helpers.py
@@ -16,6 +16,8 @@ def run_language(
         version: str | None = None,
         deps: Sequence[str] = (),
         is_local: bool = False,
+        require_serial: bool = True,
+        color: bool = False,
 ) -> tuple[int, bytes]:
     prefix = Prefix(str(path))
     version = version or language.get_default_version()
@@ -31,8 +33,8 @@ def run_language(
             args,
             file_args,
             is_local=is_local,
-            require_serial=True,
-            color=False,
+            require_serial=require_serial,
+            color=color,
         )
         out = out.replace(b'\r\n', b'\n')
         return ret, out
diff --git a/tests/repository_test.py b/tests/repository_test.py
@@ -25,25 +25,24 @@
 from testing.fixtures import make_config_from_repo
 from testing.fixtures import make_repo
 from testing.fixtures import modify_manifest
+from testing.language_helpers import run_language
 from testing.util import cwd
 from testing.util import get_resource_path
 
 
-def _norm_out(b):
-    return b.replace(b'\r\n', b'\n')
-
-
 def _hook_run(hook, filenames, color):
-    with languages[hook.language].in_env(hook.prefix, hook.language_version):
-        return languages[hook.language].run_hook(
-            hook.prefix,
-            hook.entry,
-            hook.args,
-            filenames,
-            is_local=hook.src == 'local',
-            require_serial=hook.require_serial,
-            color=color,
-        )
+    return run_language(
+        path=hook.prefix.prefix_dir,
+        language=languages[hook.language],
+        exe=hook.entry,
+        args=hook.args,
+        file_args=filenames,
+        version=hook.language_version,
+        deps=hook.additional_dependencies,
+        is_local=hook.src == 'local',
+        require_serial=hook.require_serial,
+        color=color,
+    )
 
 
 def _get_hook_no_install(repo_config, store, hook_id):
@@ -77,7 +76,7 @@ def _test_hook_repo(
     hook = _get_hook(config, store, hook_id)
     ret, out = _hook_run(hook, args, color=color)
     assert ret == expected_return_code
-    assert _norm_out(out) == expected
+    assert out == expected
 
 
 def test_python_hook(tempdir_factory, store):
@@ -425,7 +424,7 @@ def test_local_python_repo(store, local_python_config):
     assert hook.language_version != C.DEFAULT
     ret, out = _hook_run(hook, ('filename',), color=False)
     assert ret == 0
-    assert _norm_out(out) == b"['filename']\nHello World\n"
+    assert out == b"['filename']\nHello World\n"
 
 
 def test_default_language_version(store, local_python_config):
