From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 8 Mar 2016 14:11:26 +0000 (+0200)
Subject: Issues #23808, #25911: Trying to fix walk tests on Windows.
X-Git-Tag: v3.4.5rc1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=388b90f28e029daaf06aae8026b596e2f20a1cd3;p=python

Issues #23808, #25911: Trying to fix walk tests on Windows.

On Windows a symlink can has the FILE_ATTRIBUTE_DIRECTORY flag.
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index e29b0d585c..c5f5937889 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"])