Commit 3f1b95b4 authored by Serhiy Storchaka's avatar Serhiy Storchaka

Merge heads

parents e3a7d26a ac1e7f69
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment