Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Hopeful fix for test_rglob_common on Windows without symlinks. (Merge 3.5->3.6)

This commit is contained in:
Guido van Rossum 2016-01-07 13:13:31 -08:00
parent 8355bd7f66 03abf6dd98
commit 2900995edd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_pathlib.py
View File

@ -1456,8 +1456,11 @@ class _BasePathTest(object):
_check(it, ["fileA"]) _check(it, ["fileA"])
_check(p.rglob("fileB"), ["dirB/fileB"]) _check(p.rglob("fileB"), ["dirB/fileB"])
_check(p.rglob("*/fileA"), []) _check(p.rglob("*/fileA"), [])
_check(p.rglob("*/fileB"), ["dirB/fileB", "dirB/linkD/fileB", if symlink_skip_reason:
"linkB/fileB", "dirA/linkC/fileB"]) _check(p.rglob("*/fileB"), ["dirB/fileB"])
else:
_check(p.rglob("*/fileB"), ["dirB/fileB", "dirB/linkD/fileB",
"linkB/fileB", "dirA/linkC/fileB"])
_check(p.rglob("file*"), ["fileA", "dirB/fileB", _check(p.rglob("file*"), ["fileA", "dirB/fileB",
"dirC/fileC", "dirC/dirD/fileD"]) "dirC/fileC", "dirC/dirD/fileD"])
p = P(BASE, "dirC") p = P(BASE, "dirC")