Merge pull request #896 from pre-commit/cleanup

asottile · web-flow · commit 7afb2944b226 · 2018-12-27T19:26:16.000-08:00
misc cleanup
diff --git a/pre_commit/file_lock.py b/pre_commit/file_lock.py
@@ -41,14 +41,14 @@ def _locked(fileno, blocked_cb):
             # "Regions should be locked only briefly and should be unlocked
             # before closing a file or exiting the program."
             msvcrt.locking(fileno, msvcrt.LK_UNLCK, _region)
-except ImportError:  # pragma: no cover (posix)
+except ImportError:  # pragma: windows no cover
     import fcntl
 
     @contextlib.contextmanager
     def _locked(fileno, blocked_cb):
         try:
             fcntl.flock(fileno, fcntl.LOCK_EX | fcntl.LOCK_NB)
-        except IOError:
+        except IOError:  # pragma: no cover (tests are single-threaded)
             blocked_cb()
             fcntl.flock(fileno, fcntl.LOCK_EX)
         try:
diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py
@@ -28,7 +28,7 @@ def get_env_patch(venv):
         install_prefix = r'{}\bin'.format(win_venv.strip())
     elif sys.platform == 'win32':  # pragma: no cover
         install_prefix = bin_dir(venv)
-    else:
+    else:  # pragma: windows no cover
         install_prefix = venv
     return (
         ('NODE_VIRTUAL_ENV', venv),
diff --git a/tests/commands/install_uninstall_test.py b/tests/commands/install_uninstall_test.py
@@ -84,7 +84,7 @@ def test_install_refuses_core_hookspath(in_git_dir, store):
     assert install(C.CONFIG_FILE, store)
 
 
-@xfailif_no_symlink  # pragma: no cover (non-windows)
+@xfailif_no_symlink  # pragma: windows no cover
 def test_install_hooks_dead_symlink(in_git_dir, store):
     hook = in_git_dir.join('.git/hooks').ensure_dir().join('pre-commit')
     os.symlink('/fake/baz', hook.strpath)
@@ -421,17 +421,14 @@ def test_replace_old_commit_script(tempdir_factory, store):
         assert NORMAL_PRE_COMMIT_RUN.match(output)
 
 
-def test_uninstall_doesnt_remove_not_our_hooks(tempdir_factory):
-    path = git_dir(tempdir_factory)
-    with cwd(path):
-        mkdirp(os.path.join(path, '.git/hooks'))
-        with io.open(os.path.join(path, '.git/hooks/pre-commit'), 'w') as f:
-            f.write('#!/usr/bin/env bash\necho 1\n')
-        make_executable(f.name)
+def test_uninstall_doesnt_remove_not_our_hooks(in_git_dir):
+    pre_commit = in_git_dir.join('.git/hooks').ensure_dir().join('pre-commit')
+    pre_commit.write('#!/usr/bin/env bash\necho 1\n')
+    make_executable(pre_commit.strpath)
 
-        assert uninstall() == 0
+    assert uninstall() == 0
 
-        assert os.path.exists(os.path.join(path, '.git/hooks/pre-commit'))
+    assert pre_commit.exists()
 
 
 PRE_INSTALLED = re.compile(
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
@@ -781,8 +781,8 @@ def test_include_exclude_base_case(some_filenames):
     ]
 
 
-@xfailif_no_symlink
-def test_matches_broken_symlink(tmpdir):  # pragma: no cover (non-windows)
+@xfailif_no_symlink  # pragma: windows no cover
+def test_matches_broken_symlink(tmpdir):
     with tmpdir.as_cwd():
         os.symlink('does-not-exist', 'link')
         ret = _filter_by_include_exclude({'link'}, '', '^$')
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -65,9 +65,10 @@ def in_tmpdir(tempdir_factory):
 
 @pytest.fixture
 def in_git_dir(tmpdir):
-    with tmpdir.as_cwd():
+    repo = tmpdir.join('repo').ensure_dir()
+    with repo.as_cwd():
         cmd_output('git', 'init')
-        yield tmpdir
+        yield repo
 
 
 def _make_conflict():
diff --git a/tests/git_test.py b/tests/git_test.py
@@ -9,45 +9,34 @@
 from pre_commit import git
 from pre_commit.error_handler import FatalError
 from pre_commit.util import cmd_output
-from testing.fixtures import git_dir
-from testing.util import cwd
 
 
-def test_get_root_at_root(tempdir_factory):
-    path = git_dir(tempdir_factory)
-    with cwd(path):
-        assert os.path.normcase(git.get_root()) == os.path.normcase(path)
+def test_get_root_at_root(in_git_dir):
+    expected = os.path.normcase(in_git_dir.strpath)
+    assert os.path.normcase(git.get_root()) == expected
 
 
-def test_get_root_deeper(tempdir_factory):
-    path = git_dir(tempdir_factory)
+def test_get_root_deeper(in_git_dir):
+    expected = os.path.normcase(in_git_dir.strpath)
+    with in_git_dir.join('foo').ensure_dir().as_cwd():
+        assert os.path.normcase(git.get_root()) == expected
 
-    foo_path = os.path.join(path, 'foo')
-    os.mkdir(foo_path)
-    with cwd(foo_path):
-        assert os.path.normcase(git.get_root()) == os.path.normcase(path)
 
+def test_get_root_not_git_dir(in_tmpdir):
+    with pytest.raises(FatalError):
+        git.get_root()
 
-def test_get_root_not_git_dir(tempdir_factory):
-    with cwd(tempdir_factory.get()):
-        with pytest.raises(FatalError):
-            git.get_root()
 
+def test_get_staged_files_deleted(in_git_dir):
+    in_git_dir.join('test').ensure()
+    cmd_output('git', 'add', 'test')
+    cmd_output('git', 'commit', '-m', 'foo', '--allow-empty')
+    cmd_output('git', 'rm', '--cached', 'test')
+    assert git.get_staged_files() == []
 
-def test_get_staged_files_deleted(tempdir_factory):
-    path = git_dir(tempdir_factory)
-    with cwd(path):
-        open('test', 'a').close()
-        cmd_output('git', 'add', 'test')
-        cmd_output('git', 'commit', '-m', 'foo', '--allow-empty')
-        cmd_output('git', 'rm', '--cached', 'test')
-        assert git.get_staged_files() == []
 
-
-def test_is_not_in_merge_conflict(tempdir_factory):
-    path = git_dir(tempdir_factory)
-    with cwd(path):
-        assert git.is_in_merge_conflict() is False
+def test_is_not_in_merge_conflict(in_git_dir):
+    assert git.is_in_merge_conflict() is False
 
 
 def test_is_in_merge_conflict(in_merge_conflict):
@@ -114,11 +103,10 @@ def test_parse_merge_msg_for_conflicts(input, expected_output):
     assert ret == expected_output
 
 
-def test_get_changed_files(in_tmpdir):
-    cmd_output('git', 'init', '.')
+def test_get_changed_files(in_git_dir):
     cmd_output('git', 'commit', '--allow-empty', '-m', 'initial commit')
-    open('a.txt', 'a').close()
-    open('b.txt', 'a').close()
+    in_git_dir.join('a.txt').ensure()
+    in_git_dir.join('b.txt').ensure()
     cmd_output('git', 'add', '.')
     cmd_output('git', 'commit', '-m', 'add some files')
     files = git.get_changed_files('HEAD', 'HEAD^')
@@ -143,15 +131,12 @@ def test_zsplit(s, expected):
 
 
 @pytest.fixture
-def non_ascii_repo(tmpdir):
-    repo = tmpdir.join('repo').ensure_dir()
-    with repo.as_cwd():
-        cmd_output('git', 'init', '.')
-        cmd_output('git', 'commit', '--allow-empty', '-m', 'initial commit')
-        repo.join('интервью').ensure()
-        cmd_output('git', 'add', '.')
-        cmd_output('git', 'commit', '--allow-empty', '-m', 'initial commit')
-        yield repo
+def non_ascii_repo(in_git_dir):
+    cmd_output('git', 'commit', '--allow-empty', '-m', 'initial commit')
+    in_git_dir.join('интервью').ensure()
+    cmd_output('git', 'add', '.')
+    cmd_output('git', 'commit', '--allow-empty', '-m', 'initial commit')
+    yield in_git_dir
 
 
 def test_all_files_non_ascii(non_ascii_repo):
diff --git a/tests/languages/python_test.py b/tests/languages/python_test.py
@@ -11,7 +11,7 @@ def test_norm_version_expanduser():
     if os.name == 'nt':  # pragma: no cover (nt)
         path = r'~\python343'
         expected_path = r'{}\python343'.format(home)
-    else:  # pragma: no cover (non-nt)
+    else:  # pragma: windows no cover
         path = '~/.pyenv/versions/3.4.3/bin/python'
         expected_path = home + '/.pyenv/versions/3.4.3/bin/python'
     result = python.norm_version(path)
diff --git a/tests/meta_hooks/check_hooks_apply_test.py b/tests/meta_hooks/check_hooks_apply_test.py
@@ -1,10 +1,8 @@
 from pre_commit.meta_hooks import check_hooks_apply
 from testing.fixtures import add_config_to_repo
-from testing.fixtures import git_dir
-from testing.util import cwd
 
 
-def test_hook_excludes_everything(capsys, tempdir_factory, mock_store_dir):
+def test_hook_excludes_everything(capsys, in_git_dir, mock_store_dir):
     config = {
         'repos': [
             {
@@ -19,17 +17,15 @@ def test_hook_excludes_everything(capsys, tempdir_factory, mock_store_dir):
         ],
     }
 
-    repo = git_dir(tempdir_factory)
-    add_config_to_repo(repo, config)
+    add_config_to_repo(in_git_dir.strpath, config)
 
-    with cwd(repo):
-        assert check_hooks_apply.main(()) == 1
+    assert check_hooks_apply.main(()) == 1
 
     out, _ = capsys.readouterr()
     assert 'check-useless-excludes does not apply to this repository' in out
 
 
-def test_hook_includes_nothing(capsys, tempdir_factory, mock_store_dir):
+def test_hook_includes_nothing(capsys, in_git_dir, mock_store_dir):
     config = {
         'repos': [
             {
@@ -44,17 +40,15 @@ def test_hook_includes_nothing(capsys, tempdir_factory, mock_store_dir):
         ],
     }
 
-    repo = git_dir(tempdir_factory)
-    add_config_to_repo(repo, config)
+    add_config_to_repo(in_git_dir.strpath, config)
 
-    with cwd(repo):
-        assert check_hooks_apply.main(()) == 1
+    assert check_hooks_apply.main(()) == 1
 
     out, _ = capsys.readouterr()
     assert 'check-useless-excludes does not apply to this repository' in out
 
 
-def test_hook_types_not_matched(capsys, tempdir_factory, mock_store_dir):
+def test_hook_types_not_matched(capsys, in_git_dir, mock_store_dir):
     config = {
         'repos': [
             {
@@ -69,19 +63,15 @@ def test_hook_types_not_matched(capsys, tempdir_factory, mock_store_dir):
         ],
     }
 
-    repo = git_dir(tempdir_factory)
-    add_config_to_repo(repo, config)
+    add_config_to_repo(in_git_dir.strpath, config)
 
-    with cwd(repo):
-        assert check_hooks_apply.main(()) == 1
+    assert check_hooks_apply.main(()) == 1
 
     out, _ = capsys.readouterr()
     assert 'check-useless-excludes does not apply to this repository' in out
 
 
-def test_hook_types_excludes_everything(
-        capsys, tempdir_factory, mock_store_dir,
-):
+def test_hook_types_excludes_everything(capsys, in_git_dir, mock_store_dir):
     config = {
         'repos': [
             {
@@ -96,17 +86,15 @@ def test_hook_types_excludes_everything(
         ],
     }
 
-    repo = git_dir(tempdir_factory)
-    add_config_to_repo(repo, config)
+    add_config_to_repo(in_git_dir.strpath, config)
 
-    with cwd(repo):
-        assert check_hooks_apply.main(()) == 1
+    assert check_hooks_apply.main(()) == 1
 
     out, _ = capsys.readouterr()
     assert 'check-useless-excludes does not apply to this repository' in out
 
 
-def test_valid_exceptions(capsys, tempdir_factory, mock_store_dir):
+def test_valid_exceptions(capsys, in_git_dir, mock_store_dir):
     config = {
         'repos': [
             {
@@ -142,11 +130,9 @@ def test_valid_exceptions(capsys, tempdir_factory, mock_store_dir):
         ],
     }
 
-    repo = git_dir(tempdir_factory)
-    add_config_to_repo(repo, config)
+    add_config_to_repo(in_git_dir.strpath, config)
 
-    with cwd(repo):
-        assert check_hooks_apply.main(()) == 0
+    assert check_hooks_apply.main(()) == 0
 
     out, _ = capsys.readouterr()
     assert out == ''
diff --git a/tests/meta_hooks/check_useless_excludes_test.py b/tests/meta_hooks/check_useless_excludes_test.py
diff --git a/tests/repository_test.py b/tests/repository_test.py
diff --git a/tests/staged_files_only_test.py b/tests/staged_files_only_test.py

Original file line number	Diff line number	Diff line change
`@@ -781,8 +781,8 @@ def test_include_exclude_base_case(some_filenames):`
`781`	`781`	`]`
`782`	`782`
`783`	`783`
`784`		`-@xfailif_no_symlink`
`785`		`-def test_matches_broken_symlink(tmpdir): # pragma: no cover (non-windows)`
	`784`	`+@xfailif_no_symlink # pragma: windows no cover`
	`785`	`+def test_matches_broken_symlink(tmpdir):`
`786`	`786`	`with tmpdir.as_cwd():`
`787`	`787`	`os.symlink('does-not-exist', 'link')`
`788`	`788`	`ret = _filter_by_include_exclude({'link'}, '', '^$')`