cpython: da020e408c7f (original) (raw)

Mercurial > cpython

changeset 100456:da020e408c7f

Issues #23808, #25911: Trying to fix walk tests on Windows. On Windows a symlink can has the FILE_ATTRIBUTE_DIRECTORY flag. [#23808]

Serhiy Storchaka storchaka@gmail.com
date	Tue, 08 Mar 2016 16:12:46 +0200
parents	60430bdcb426(current diff)f9e22717722d(diff)
children	fefedbaac640
files	Lib/test/test_os.py
diffstat	1 files changed, 5 insertions(+), 1 deletions(-)[+] [-] Lib/test/test_os.py 6

line wrap: on

line diff

--- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -836,7 +836,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"])[](#l1.7)

       if os.path.isdir(broken_link_path):[](#l1.8)

           # On Windows a symlink can has the FILE_ATTRIBUTE_DIRECTORY flag.[](#l1.9)

           self.sub2_tree = (sub2_path, ["broken_link", "link"], ["tmp3"])[](#l1.10)

```
       else:[](#l1.11)
```

           self.sub2_tree = (sub2_path, ["link"], ["broken_link", "tmp3"])[](#l1.12)
   else:[](#l1.13)
       self.sub2_tree = (sub2_path, [], ["tmp3"])[](#l1.14)