diff options
| author | Guido van Rossum <guido@python.org> | 2016-01-07 13:13:04 -0800 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2016-01-07 13:13:04 -0800 |
| commit | 03abf6dd98d083cd6db24db75d70457578d80767 (patch) | |
| tree | d0f8f2331a8a6abbfaca2401e0f90da6a388cb20 /Lib/test/test_pathlib.py | |
| parent | c3a8272705f26499d522ddda8ef0f07f8efcee40 (diff) | |
| parent | 9c39b67ca5474791409ba170e24f4fd96ea1445b (diff) | |
| download | cpython-git-03abf6dd98d083cd6db24db75d70457578d80767.tar.gz | |
Hopeful fix for test_rglob_common on Windows without symlinks. (Merge 3.4->3.5)
Diffstat (limited to 'Lib/test/test_pathlib.py')
| -rw-r--r-- | Lib/test/test_pathlib.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 4abf13d194..490d423ca3 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -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") |