summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2016-01-07 21:12:34 (GMT)
committerGuido van Rossum <guido@python.org>2016-01-07 21:12:34 (GMT)
commit9c39b67ca5474791409ba170e24f4fd96ea1445b (patch)
treee91c3635f18fbfb45995504c1b9a583001595410
parentbc9fddaf50df55f1b4d11ecb5598b95adacac707 (diff)
downloadcpython-9c39b67ca5474791409ba170e24f4fd96ea1445b.zip
cpython-9c39b67ca5474791409ba170e24f4fd96ea1445b.tar.gz
cpython-9c39b67ca5474791409ba170e24f4fd96ea1445b.tar.bz2
Hopeful fix for test_rglob_common on Windows without symlinks.
-rw-r--r--Lib/test/test_pathlib.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index a12af22..6b3c70d 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1399,8 +1399,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")