commit 2900995edd00d86e1579e80c939ef67e7c83a5b4
author Guido van Rossum <guido@dropbox.com> Thu Jan 07 13:13:31 2016 -0800
committer Guido van Rossum <guido@dropbox.com> Thu Jan 07 13:13:31 2016 -0800
tree b3dd12b2b2fa992b63cd85f5f34f45341287437d
parent 8355bd7f66029708c9a1d4145314b0654c81ea48
parent 03abf6dd98d083cd6db24db75d70457578d80767

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

Lib/test/test_pathlib.py

diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 8e1b545..b725cd9 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1456,8 +1456,11 @@
         _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")