[Python-checkins] cpython (merge 3.5 -> default): Hopeful fix for test_rglob_common on Windows without symlinks. (Merge 3.5->3.6)

[guido.van.rossum]

https://hg.python.org/cpython/rev/74adca5e885c
changeset:   99803:74adca5e885c
parent:      99800:398cb8c183da
parent:      99802:9ead69bd94f1
user:        Guido van Rossum <guido at dropbox.com>
date:        Thu Jan 07 13:13:31 2016 -0800
summary:
  Hopeful fix for test_rglob_common on Windows without symlinks. (Merge 3.5->3.6)

files:
  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
--- 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")

-- 
Repository URL: https://hg.python.org/cpython