summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-12-28 22:01:31 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-12-28 22:01:31 (GMT)
commit3f1b95b4ae0db638dd88e71e594aeb2c770c9562 (patch)
treeed3f3a0df2348c2affe5b45599fe49ae031be8c8 /Lib
parente3a7d26aa68b3068bea6c417f6f61530b6f0794e (diff)
parentac1e7f6983ef4f0feef6389d458544bf924f6965 (diff)
downloadcpython-3f1b95b4ae0db638dd88e71e594aeb2c770c9562.zip
cpython-3f1b95b4ae0db638dd88e71e594aeb2c770c9562.tar.gz
cpython-3f1b95b4ae0db638dd88e71e594aeb2c770c9562.tar.bz2
Merge heads
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_pathlib.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 1c53ab7..80cb97e 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1437,14 +1437,14 @@ class _BasePathTest(object):
self.assertEqual(set(p.glob("dirA/../file*")), { P(BASE, "dirA/../fileA") })
self.assertEqual(set(p.glob("../xyzzy")), set())
- def _check_resolve_relative(self, p, expected):
- q = p.resolve()
- self.assertEqual(q, expected)
- def _check_resolve_absolute(self, p, expected):
+ def _check_resolve(self, p, expected):
q = p.resolve()
self.assertEqual(q, expected)
+ # this can be used to check both relative and absolute resolutions
+ _check_resolve_relative = _check_resolve_absolute = _check_resolve
+
@with_symlinks
def test_resolve_common(self):
P = self.cls