better no-cover for windows

asottile · asottile · commit 2af0b0b4f3ef · 2018-12-27T18:25:52.000-08:00
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)
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/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/repository_test.py b/tests/repository_test.py
@@ -502,10 +502,8 @@ def test_additional_dependencies_roll_forward(tempdir_factory, store):
         assert 'mccabe' not in cmd_output('pip', 'freeze', '-l')[1]
 
 
-@xfailif_windows_no_ruby
-def test_additional_ruby_dependencies_installed(
-        tempdir_factory, store,
-):  # pragma: no cover (non-windows)
+@xfailif_windows_no_ruby  # pragma: windows no cover
+def test_additional_ruby_dependencies_installed(tempdir_factory, store):
     path = make_repo(tempdir_factory, 'ruby_hooks_repo')
     config = make_config_from_repo(path)
     config['hooks'][0]['additional_dependencies'] = ['thread_safe', 'tins']
@@ -518,10 +516,8 @@ def test_additional_ruby_dependencies_installed(
         assert 'tins' in output
 
 
-@xfailif_broken_deep_listdir
-def test_additional_node_dependencies_installed(
-        tempdir_factory, store,
-):  # pragma: no cover (non-windows)
+@xfailif_broken_deep_listdir  # pragma: windows no cover
+def test_additional_node_dependencies_installed(tempdir_factory, store):
     path = make_repo(tempdir_factory, 'node_hooks_repo')
     config = make_config_from_repo(path)
     # Careful to choose a small package that's not depped by npm

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'}, '', '^$')`