From: Guido van Rossum <guido@python.org>
Date: Thu, 7 Jan 2016 21:12:34 +0000 (-0800)
Subject: Hopeful fix for test_rglob_common on Windows without symlinks.
X-Git-Tag: v3.4.5rc1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c39b67ca5474791409ba170e24f4fd96ea1445b;p=python

Hopeful fix for test_rglob_common on Windows without symlinks.
---

diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index a12af225c8..6b3c70de94 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")