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

This commit is contained in:
Guido van Rossum 2016-01-07 13:13:04 -08:00
commit 03abf6dd98
1 changed files with 5 additions and 2 deletions

View File

@ -1456,8 +1456,11 @@ class _BasePathTest(object):
_check(it, ["fileA"])
_check(p.rglob("fileB"), ["dirB/fileB"])
_check(p.rglob("*/fileA"), [])
_check(p.rglob("*/fileB"), ["dirB/fileB", "dirB/linkD/fileB",
"linkB/fileB", "dirA/linkC/fileB"])
if symlink_skip_reason:
_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",
"dirC/fileC", "dirC/dirD/fileD"])
p = P(BASE, "dirC")