summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-01-24 07:59:28 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-01-24 07:59:28 (GMT)
commit5311c1d7ab24f862b9b0bb272a9aee9c4f4ac023 (patch)
treeaef57f35c7e9b616acf4597f63a8165e0d55491f /Lib/test
parent3b65fd7e9784967567e66bd67e9205cbb0d53d3a (diff)
downloadcpython-5311c1d7ab24f862b9b0bb272a9aee9c4f4ac023.zip
cpython-5311c1d7ab24f862b9b0bb272a9aee9c4f4ac023.tar.gz
cpython-5311c1d7ab24f862b9b0bb272a9aee9c4f4ac023.tar.bz2
Issue #13772: In os.symlink() under Windows, do not try to guess the link
target's type (file or directory). The detection was buggy and made the call non-atomic (therefore prone to race conditions).
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_os.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 4da1f1d..e573bd2 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -476,7 +476,12 @@ class WalkTests(unittest.TestCase):
f.write("I'm " + path + " and proud of it. Blame test_os.\n")
f.close()
if support.can_symlink():
- os.symlink(os.path.abspath(t2_path), link_path)
+ if os.name == 'nt':
+ def symlink_to_dir(src, dest):
+ os.symlink(src, dest, True)
+ else:
+ symlink_to_dir = os.symlink
+ symlink_to_dir(os.path.abspath(t2_path), link_path)
sub2_tree = (sub2_path, ["link"], ["tmp3"])
else:
sub2_tree = (sub2_path, [], ["tmp3"])
@@ -1106,7 +1111,7 @@ class Win32SymlinkTests(unittest.TestCase):
os.remove(self.missing_link)
def test_directory_link(self):
- os.symlink(self.dirlink_target, self.dirlink)
+ os.symlink(self.dirlink_target, self.dirlink, True)
self.assertTrue(os.path.exists(self.dirlink))
self.assertTrue(os.path.isdir(self.dirlink))
self.assertTrue(os.path.islink(self.dirlink))