From 388b90f28e029daaf06aae8026b596e2f20a1cd3 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Tue, 8 Mar 2016 16:11:26 +0200 Subject: [PATCH] Issues #23808, #25911: Trying to fix walk tests on Windows. On Windows a symlink can has the FILE_ATTRIBUTE_DIRECTORY flag. --- Lib/test/test_os.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index e29b0d585c7..c5f5937889f 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -770,7 +770,11 @@ class WalkTests(unittest.TestCase): if support.can_symlink(): os.symlink(os.path.abspath(t2_path), self.link_path) os.symlink('broken', broken_link_path, True) - self.sub2_tree = (sub2_path, ["link"], ["broken_link", "tmp3"]) + if os.path.isdir(broken_link_path): + # On Windows a symlink can has the FILE_ATTRIBUTE_DIRECTORY flag. + self.sub2_tree = (sub2_path, ["broken_link", "link"], ["tmp3"]) + else: + self.sub2_tree = (sub2_path, ["link"], ["broken_link", "tmp3"]) else: self.sub2_tree = (sub2_path, [], ["tmp3"])