mirror of https://github.com/python/cpython
Make test_relpath() pass on Windows.
This commit is contained in:
parent
14553b08a1
commit
75c7eb4fd8
|
@ -480,15 +480,19 @@ class PosixPathTest(unittest.TestCase):
|
||||||
safe_rmdir(ABSTFN)
|
safe_rmdir(ABSTFN)
|
||||||
|
|
||||||
def test_relpath(self):
|
def test_relpath(self):
|
||||||
currentdir = os.path.split(os.getcwd())[-1]
|
(real_getcwd, os.getcwd) = (os.getcwd, lambda: r"/home/user/bar")
|
||||||
self.assertRaises(ValueError, posixpath.relpath, "")
|
try:
|
||||||
self.assertEqual(posixpath.relpath("a"), "a")
|
curdir = os.path.split(os.getcwd())[-1]
|
||||||
self.assertEqual(posixpath.relpath(os.path.abspath("a")), "a")
|
self.assertRaises(ValueError, posixpath.relpath, "")
|
||||||
self.assertEqual(posixpath.relpath("a/b"), "a/b")
|
self.assertEqual(posixpath.relpath("a"), "a")
|
||||||
self.assertEqual(posixpath.relpath("../a/b"), "../a/b")
|
self.assertEqual(posixpath.relpath(posixpath.abspath("a")), "a")
|
||||||
self.assertEqual(posixpath.relpath("a", "../b"), "../"+currentdir+"/a")
|
self.assertEqual(posixpath.relpath("a/b"), "a/b")
|
||||||
self.assertEqual(posixpath.relpath("a/b", "../c"), "../"+currentdir+"/a/b")
|
self.assertEqual(posixpath.relpath("../a/b"), "../a/b")
|
||||||
self.assertEqual(posixpath.relpath("a", "b/c"), "../../a")
|
self.assertEqual(posixpath.relpath("a", "../b"), "../"+curdir+"/a")
|
||||||
|
self.assertEqual(posixpath.relpath("a/b", "../c"), "../"+curdir+"/a/b")
|
||||||
|
self.assertEqual(posixpath.relpath("a", "b/c"), "../../a")
|
||||||
|
finally:
|
||||||
|
os.getcwd = real_getcwd
|
||||||
|
|
||||||
def test_main():
|
def test_main():
|
||||||
test_support.run_unittest(PosixPathTest)
|
test_support.run_unittest(PosixPathTest)
|
||||||
|
|
Loading…
Reference in New Issue