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

03abf6dd · Guido van Rossum · c3a82727 · 9c39b67c · 03abf6dd
Commit 03abf6dd authored Jan 07, 2016 by Guido van Rossum
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Lib/test/test_pathlib.py Lib/test/test_pathlib.py +5 -2

No files found.
--- 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")