Simplify a few things

tests/commands/install_uninstall_test.py

@@ -10,7 +10,7 @@ import subprocess
 import sys
 
 import mock
-from pre_commit.commands.install_uninstall import get_hook_path
+
 from pre_commit.commands.install_uninstall import IDENTIFYING_HASH
 from pre_commit.commands.install_uninstall import install
 from pre_commit.commands.install_uninstall import is_our_pre_commit
@@ -22,7 +22,6 @@ from pre_commit.runner import Runner
 from pre_commit.util import cmd_output
 from pre_commit.util import cwd
 from pre_commit.util import resource_filename
-
 from testing.fixtures import git_dir
 from testing.fixtures import make_consuming_repo
 
@@ -71,11 +70,12 @@ def test_install_pre_commit(tmpdir_factory):
     assert ret == 0
     assert os.path.exists(runner.pre_push_path)
     pre_push_contents = io.open(runner.pre_push_path).read()
-    pre_push_template_contents = io.open(runner.pre_push_template).read()
+    pre_push_tmpl = resource_filename('pre-push-tmpl')
+    pre_push_template_contents = io.open(pre_push_tmpl).read()
     expected_contents = io.open(pre_commit_script).read().format(
         sys_executable=sys.executable,
         hook_type='pre-push',
-        pre_push=pre_push_template_contents
+        pre_push=pre_push_template_contents,
     )
     assert pre_push_contents == expected_contents
 
@@ -406,17 +406,3 @@ def test_installed_from_venv(tmpdir_factory):
         )
         assert ret == 0
         assert NORMAL_PRE_COMMIT_RUN.match(output)
-
-
-def test_get_hook_path(tmpdir_factory):
-    path = git_dir(tmpdir_factory)
-    with cwd(path):
-        runner = Runner(path)
-        expected_paths = (os.path.join(path, '.git/hooks/pre-commit'),
-                          os.path.join(path, '.git/hooks/pre-commit.legacy')
-                          )
-        assert expected_paths == get_hook_path(runner, 'pre-commit')
-        expected_paths = (os.path.join(path, '.git/hooks/pre-push'),
-                          os.path.join(path, '.git/hooks/pre-push.legacy')
-                          )
-        assert expected_paths == get_hook_path(runner, 'pre-push')

tests/commands/run_test.py

@@ -132,20 +132,21 @@ def test_run(
 
 
 @pytest.mark.parametrize(
-    ('origin', 'source', 'expect_stash'),
+    ('origin', 'source', 'expect_failure'),
     (
         ('master', 'master', False),
         ('master', '', True),
         ('', 'master', True),
     )
 )
-def test_origin_source_define(
-        repo_with_passing_hook, origin, source, expect_stash,
-        mock_out_store_directory):
+def test_origin_source_error_msg(
+        repo_with_passing_hook, origin, source, expect_failure,
+        mock_out_store_directory,
+):
     args = _get_opts(origin=origin, source=source)
     ret, printed = _do_run(repo_with_passing_hook, args)
-    warning_msg = '--origin and --source depend on each other.'
-    if expect_stash:
+    warning_msg = 'Specify both --origin and --source.'
+    if expect_failure:
         assert ret == 1
         assert warning_msg in printed
     else:
@@ -297,7 +298,8 @@ def test_stdout_write_bug_py26(
 
 
 def test_get_changed_files():
-    files = list(get_changed_files('78c682a1d13ba20e7cb735313b9314a74365cd3a',
-                                   '3387edbb1288a580b37fe25225aa0b856b18ad1a'
-                                   ))
+    files = get_changed_files(
+        '78c682a1d13ba20e7cb735313b9314a74365cd3a',
+        '3387edbb1288a580b37fe25225aa0b856b18ad1a',
+    )
     assert files == ['CHANGELOG.md', 'setup.py']

tests/runner_test.py

@@ -7,7 +7,6 @@ import os.path
 import pre_commit.constants as C
 from pre_commit.runner import Runner
 from pre_commit.util import cwd
-from pre_commit.util import resource_filename
 from testing.fixtures import git_dir
 from testing.fixtures import make_consuming_repo
 
@@ -65,28 +64,6 @@ def test_pre_push_path():
     assert runner.pre_push_path == expected_path
 
 
-def test_pre_commit_legacy_path():
-    runner = Runner('foo/bar')
-    expected_path = os.path.join('foo/bar', '.git/hooks/pre-commit.legacy')
-    assert runner.pre_commit_legacy_path == expected_path
-
-
-def test_pre_push_legacy_path():
-    runner = Runner('foo/bar')
-    expected_path = os.path.join('foo/bar', '.git/hooks/pre-push.legacy')
-    assert runner.pre_push_legacy_path == expected_path
-
-
-def test_pre_template():
-    runner = Runner('foo/bar')
-    assert runner.pre_template == resource_filename('hook-tmpl')
-
-
-def test_pre_push_template():
-    runner = Runner('foo/bar')
-    assert runner.pre_push_template == resource_filename('pre-push-tmpl')
-
-
 def test_cmd_runner(mock_out_store_directory):
     runner = Runner('foo/bar')
     ret = runner.cmd_runner