diff --git a/pre_commit/file_lock.py b/pre_commit/file_lock.py index 7c7e8514..cf9aeac5 100644 --- a/pre_commit/file_lock.py +++ b/pre_commit/file_lock.py @@ -41,14 +41,14 @@ try: # pragma: no cover (windows) # "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 index 8e5dc7e5..2e9e60e4 100644 --- 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 index 25a21641..401a1dec 100644 --- 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 index bc891c0c..33920e5e 100644 --- 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 index 78211cb9..366c010e 100644 --- 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 index 4d851f59..92964037 100644 --- 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