From 68854fdc1ebb32bc5d340cfb0501321034edaa2c Mon Sep 17 00:00:00 2001 From: R David Murray Date: Wed, 24 Aug 2016 08:59:47 -0400 Subject: #2466: fix test failure on windows. Windows symlink support was introduced in python3, so we need to skip those tests differently on python2. Patch by Xiang Zhang. --- Lib/test/test_posixpath.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index 98bf0e0..deaa577 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -1,5 +1,4 @@ import unittest -from test import symlink_support from test import test_support, test_genericpath from test import test_support as support @@ -106,7 +105,7 @@ class PosixPathTest(unittest.TestCase): f.write("foo") f.close() self.assertIs(posixpath.islink(test_support.TESTFN + "1"), False) - if symlink_support.can_symlink(): + if hasattr(os, 'symlink'): os.symlink(test_support.TESTFN + "1", test_support.TESTFN + "2") self.assertIs(posixpath.islink(test_support.TESTFN + "2"), True) os.remove(test_support.TESTFN + "1") @@ -211,7 +210,8 @@ class PosixPathTest(unittest.TestCase): finally: safe_rmdir(ABSTFN) - @symlink_support.skip_unless_symlink + @unittest.skipUnless(hasattr(os, 'symlink'), + 'Requires functional symlink implementation') def test_ismount_symlinks(self): # Symlinks are never mountpoints. try: -- cgit v0.12