From 251721b890a21284deb9a0beab8433c274687730 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Sun, 12 Jan 2020 12:30:40 -0800 Subject: [PATCH] os.symlink is always an attribute in py3 --- testing/util.py | 6 ------ tests/commands/install_uninstall_test.py | 2 -- tests/commands/run_test.py | 2 -- 3 files changed, 10 deletions(-) diff --git a/testing/util.py b/testing/util.py index b318618c..0c2cc6a8 100644 --- a/testing/util.py +++ b/testing/util.py @@ -45,12 +45,6 @@ xfailif_windows_no_ruby = pytest.mark.xfail( xfailif_windows = pytest.mark.xfail(os.name == 'nt', reason='windows') -xfailif_no_symlink = pytest.mark.xfail( - not hasattr(os, 'symlink'), - reason='Symlink is not supported on this platform', -) - - def supports_venv(): # pragma: no cover (platform specific) try: __import__('ensurepip') diff --git a/tests/commands/install_uninstall_test.py b/tests/commands/install_uninstall_test.py index cb17f004..c611bfb6 100644 --- a/tests/commands/install_uninstall_test.py +++ b/tests/commands/install_uninstall_test.py @@ -21,7 +21,6 @@ from testing.fixtures import remove_config_from_repo from testing.util import cmd_output_mocked_pre_commit_home from testing.util import cwd from testing.util import git_commit -from testing.util import xfailif_no_symlink from testing.util import xfailif_windows @@ -89,7 +88,6 @@ def test_install_refuses_core_hookspath(in_git_dir, store): assert install(C.CONFIG_FILE, store, hook_types=['pre-commit']) -@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 b08054f5..1ed866bc 100644 --- a/tests/commands/run_test.py +++ b/tests/commands/run_test.py @@ -27,7 +27,6 @@ from testing.util import cmd_output_mocked_pre_commit_home from testing.util import cwd from testing.util import git_commit from testing.util import run_opts -from testing.util import xfailif_no_symlink @pytest.fixture @@ -861,7 +860,6 @@ def test_include_exclude_base_case(some_filenames): ] -@xfailif_no_symlink # pragma: windows no cover def test_matches_broken_symlink(tmpdir): with tmpdir.as_cwd(): os.symlink('does-not-exist', 'link')