]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#2466: fix test failure on windows.
authorR David Murray <rdmurray@bitdance.com>
Wed, 24 Aug 2016 12:59:47 +0000 (08:59 -0400)
committerR David Murray <rdmurray@bitdance.com>
Wed, 24 Aug 2016 12:59:47 +0000 (08:59 -0400)
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

index 98bf0e041dd70135472db68970b4199b91190b87..deaa5772835b7b53a2a68bd8a324a3cd2ef425cd 100644 (file)
@@ -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: