Refactor fixtures in tests.

asottile · asottile · commit 85a76617c13b · 2014-06-15T18:49:45.000-07:00
diff --git a/pre_commit/clientlib/validate_base.py b/pre_commit/clientlib/validate_base.py
@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import argparse
 import jsonschema
diff --git a/pre_commit/clientlib/validate_config.py b/pre_commit/clientlib/validate_config.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import sys
 
 from pre_commit.clientlib.validate_base import get_run_function
diff --git a/pre_commit/clientlib/validate_manifest.py b/pre_commit/clientlib/validate_manifest.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import sys
 
 from pre_commit.clientlib.validate_base import get_run_function
diff --git a/pre_commit/color.py b/pre_commit/color.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import sys
 
 RED = '\033[41m'
diff --git a/pre_commit/constants.py b/pre_commit/constants.py
@@ -1,3 +1,6 @@
+from __future__ import unicode_literals
+
+
 CONFIG_FILE = '.pre-commit-config.yaml'
 
 MANIFEST_FILE = 'hooks.yaml'
diff --git a/pre_commit/five.py b/pre_commit/five.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 """five: six, redux"""
 # pylint:disable=invalid-name
 PY2 = (str is bytes)
diff --git a/pre_commit/git.py b/pre_commit/git.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import functools
 import logging
 import os
diff --git a/pre_commit/jsonschema_extensions.py b/pre_commit/jsonschema_extensions.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import copy
 import jsonschema
 import jsonschema.validators
diff --git a/pre_commit/languages/all.py b/pre_commit/languages/all.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from pre_commit.languages import node
 from pre_commit.languages import python
 from pre_commit.languages import ruby
diff --git a/pre_commit/languages/helpers.py b/pre_commit/languages/helpers.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 
 def run_hook(env, hook, file_args):
diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import contextlib
 
 from pre_commit.languages import helpers
diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import contextlib
 
 from pre_commit.languages import helpers
diff --git a/pre_commit/languages/script.py b/pre_commit/languages/script.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 ENVIRONMENT_DIR = None
 
 
diff --git a/pre_commit/languages/system.py b/pre_commit/languages/system.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import shlex
 
 
diff --git a/pre_commit/logging_handler.py b/pre_commit/logging_handler.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import logging
 import sys
 
diff --git a/pre_commit/manifest.py b/pre_commit/manifest.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import os.path
 from asottile.cached_property import cached_property
 
diff --git a/pre_commit/output.py b/pre_commit/output.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import subprocess
 
 from pre_commit import color
diff --git a/pre_commit/prefixed_command_runner.py b/pre_commit/prefixed_command_runner.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import os
 import os.path
 import subprocess
diff --git a/pre_commit/repository.py b/pre_commit/repository.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from asottile.cached_property import cached_property
 from asottile.ordereddict import OrderedDict
 
diff --git a/pre_commit/runner.py b/pre_commit/runner.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import os
 import os.path
 from asottile.cached_property import cached_property
diff --git a/pre_commit/staged_files_only.py b/pre_commit/staged_files_only.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import contextlib
 import io
 import logging
diff --git a/pre_commit/util.py b/pre_commit/util.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import contextlib
 import functools
 import os
diff --git a/testing/auto_namedtuple.py b/testing/auto_namedtuple.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import collections
 
 
diff --git a/testing/fixtures.py b/testing/fixtures.py
@@ -1,8 +1,10 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import io
 import os.path
 from asottile.ordereddict import OrderedDict
+from asottile.yaml import ordered_dump
 from plumbum import local
 
 import pre_commit.constants as C
@@ -25,7 +27,7 @@ def git_dir(tmpdir_factory):
     return path
 
 
-def make_hooks_repo(tmpdir_factory, repo_source):
+def make_repo(tmpdir_factory, repo_source):
     path = git_dir(tmpdir_factory)
     copy_tree_to_path(get_resource_path(repo_source), path)
     with local.cwd(path):
@@ -51,3 +53,17 @@ def make_config_from_repo(repo_path, sha=None, hooks=None, check=True):
         return wrapped_config[0]
     else:
         return config
+
+
+def write_config(directory, config):
+    assert type(config) is OrderedDict
+    with io.open(os.path.join(directory, C.CONFIG_FILE), 'w') as config_file:
+        config_file.write(ordered_dump([config],  **C.YAML_DUMP_KWARGS))
+
+
+def make_consuming_repo(tmpdir_factory, repo_source):
+    path = make_repo(tmpdir_factory, repo_source)
+    config = make_config_from_repo(path)
+    git_path = git_dir(tmpdir_factory)
+    write_config(git_path, config)
+    return git_path
diff --git a/testing/util.py b/testing/util.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import jsonschema
 import os
 import os.path
diff --git a/tests/clientlib/validate_base_test.py b/tests/clientlib/validate_base_test.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import pytest
 from asottile.ordereddict import OrderedDict
 from asottile.yaml import ordered_load
diff --git a/tests/clientlib/validate_config_test.py b/tests/clientlib/validate_config_test.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import pytest
 
 from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
diff --git a/tests/clientlib/validate_manifest_test.py b/tests/clientlib/validate_manifest_test.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import pytest
 
 from pre_commit.clientlib.validate_manifest import additional_manifest_check
diff --git a/tests/color_test.py b/tests/color_test.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import mock
 import pytest
 import sys
diff --git a/tests/commands/autoupdate_test.py b/tests/commands/autoupdate_test.py
@@ -1,10 +1,8 @@
 from __future__ import unicode_literals
 
-import io
 import pytest
 import shutil
 from asottile.ordereddict import OrderedDict
-from asottile.yaml import ordered_dump
 from plumbum import local
 
 import pre_commit.constants as C
@@ -14,14 +12,15 @@
 from pre_commit.runner import Runner
 from testing.auto_namedtuple import auto_namedtuple
 from testing.fixtures import make_config_from_repo
-from testing.fixtures import make_hooks_repo
+from testing.fixtures import make_repo
+from testing.fixtures import write_config
 from testing.util import get_head_sha
 from testing.util import get_resource_path
 
 
 @pytest.yield_fixture
 def up_to_date_repo(tmpdir_factory):
-    yield make_hooks_repo(tmpdir_factory, 'python_hooks_repo')
+    yield make_repo(tmpdir_factory, 'python_hooks_repo')
 
 
 def test_up_to_date_repo(up_to_date_repo, runner_with_mocked_store):
@@ -36,8 +35,7 @@ def test_autoupdate_up_to_date_repo(
 ):
     # Write out the config
     config = make_config_from_repo(up_to_date_repo, check=False)
-    with io.open(C.CONFIG_FILE, 'w') as config_file:
-        config_file.write(ordered_dump([config], **C.YAML_DUMP_KWARGS))
+    write_config('.', config)
 
     before = open(C.CONFIG_FILE).read()
     assert '^$' not in before
@@ -50,7 +48,7 @@ def test_autoupdate_up_to_date_repo(
 
 @pytest.yield_fixture
 def out_of_date_repo(tmpdir_factory):
-    path = make_hooks_repo(tmpdir_factory, 'python_hooks_repo')
+    path = make_repo(tmpdir_factory, 'python_hooks_repo')
     original_sha = get_head_sha(path)
 
     # Make a commit
@@ -79,8 +77,7 @@ def test_autoupdate_out_of_date_repo(
     config = make_config_from_repo(
         out_of_date_repo.path, sha=out_of_date_repo.original_sha, check=False,
     )
-    with io.open(C.CONFIG_FILE, 'w') as config_file:
-        config_file.write(ordered_dump([config], **C.YAML_DUMP_KWARGS))
+    write_config('.', config)
 
     before = open(C.CONFIG_FILE).read()
     runner = Runner('.')
@@ -95,7 +92,7 @@ def test_autoupdate_out_of_date_repo(
 
 @pytest.yield_fixture
 def hook_disappearing_repo(tmpdir_factory):
-    path = make_hooks_repo(tmpdir_factory, 'python_hooks_repo')
+    path = make_repo(tmpdir_factory, 'python_hooks_repo')
     original_sha = get_head_sha(path)
 
     with local.cwd(path):
@@ -130,8 +127,7 @@ def test_autoupdate_hook_disappearing_repo(
         hooks=[OrderedDict((('id', 'foo'),))],
         check=False,
     )
-    with io.open(C.CONFIG_FILE, 'w') as config_file:
-        config_file.write(ordered_dump([config], **C.YAML_DUMP_KWARGS))
+    write_config('.', config)
 
     before = open(C.CONFIG_FILE).read()
     runner = Runner('.')
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
@@ -11,6 +11,21 @@
 from pre_commit.commands.run import run
 from pre_commit.runner import Runner
 from testing.auto_namedtuple import auto_namedtuple
+from testing.fixtures import make_consuming_repo
+
+
+@pytest.yield_fixture
+def repo_with_passing_hook(tmpdir_factory):
+    git_path = make_consuming_repo(tmpdir_factory, 'script_hooks_repo')
+    with local.cwd(git_path):
+        yield git_path
+
+
+@pytest.yield_fixture
+def repo_with_failing_hook(tmpdir_factory):
+    git_path = make_consuming_repo(tmpdir_factory, 'failing_hook_repo')
+    with local.cwd(git_path):
+        yield git_path
 
 
 def stage_a_file():
diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/git_test.py b/tests/git_test.py
diff --git a/tests/jsonschema_extensions_test.py b/tests/jsonschema_extensions_test.py
diff --git a/tests/languages/all_test.py b/tests/languages/all_test.py
diff --git a/tests/languages/ruby_test.py b/tests/languages/ruby_test.py
diff --git a/tests/logging_handler_test.py b/tests/logging_handler_test.py
diff --git a/tests/manifest_test.py b/tests/manifest_test.py
diff --git a/tests/output_test.py b/tests/output_test.py
diff --git a/tests/prefixed_command_runner_test.py b/tests/prefixed_command_runner_test.py
diff --git a/tests/repository_test.py b/tests/repository_test.py
diff --git a/tests/runner_test.py b/tests/runner_test.py
diff --git a/tests/util_test.py b/tests/util_test.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from __future__ import print_function`
	`2`	`+from __future__ import unicode_literals`
`2`	`3`
`3`	`4`	`import argparse`
`4`	`5`	`import jsonschema`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import unicode_literals`
	`2`	`+`
`1`	`3`	`import sys`
`2`	`4`
`3`	`5`	`from pre_commit.clientlib.validate_base import get_run_function`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import unicode_literals`
	`2`	`+`
`1`	`3`	`"""five: six, redux"""`
`2`	`4`	`# pylint:disable=invalid-name`
`3`	`5`	`PY2 = (str is bytes)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import unicode_literals`
	`2`	`+`
`1`	`3`	`import functools`
`2`	`4`	`import logging`
`3`	`5`	`import os`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import unicode_literals`
	`2`	`+`
`1`	`3`	`import copy`
`2`	`4`	`import jsonschema`
`3`	`5`	`import jsonschema.validators`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import unicode_literals`
	`2`	`+`
`1`	`3`	`from pre_commit.languages import node`
`2`	`4`	`from pre_commit.languages import python`
`3`	`5`	`from pre_commit.languages import ruby`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+from __future__ import unicode_literals`
`1`	`2`
`2`	`3`
`3`	`4`	`def run_hook(env, hook, file_args):`