From 38a33ec44cc4590f2e2e9fe7aaf8bd63d4ab24e0 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Mon, 26 Jan 2015 10:26:00 +0200 Subject: [PATCH] Issue #7665: Fixed tests test_ntpath and test_urllib2 when ran in the directory containing a backslash. --- Lib/test/test_ntpath.py | 7 ++++--- Lib/test/test_urllib2.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index 7b5f7bb28c..0fbe6a1778 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -281,13 +281,14 @@ class TestNtpath(unittest.TestCase): tester('ntpath.abspath("C:\\")', "C:\\") def test_relpath(self): - currentdir = os.path.split(os.getcwd())[-1] tester('ntpath.relpath("a")', 'a') tester('ntpath.relpath(os.path.abspath("a"))', 'a') tester('ntpath.relpath("a/b")', 'a\\b') tester('ntpath.relpath("../a/b")', '..\\a\\b') - tester('ntpath.relpath("a", "../b")', '..\\'+currentdir+'\\a') - tester('ntpath.relpath("a/b", "../c")', '..\\'+currentdir+'\\a\\b') + with test_support.temp_cwd(test_support.TESTFN) as cwd_dir: + currentdir = os.path.basename(cwd_dir) + tester('ntpath.relpath("a", "../b")', '..\\'+currentdir+'\\a') + tester('ntpath.relpath("a/b", "../c")', '..\\'+currentdir+'\\a\\b') tester('ntpath.relpath("a", "b/c")', '..\\..\\a') tester('ntpath.relpath("//conky/mountpoint/a", "//conky/mountpoint/b/c")', '..\\..\\a') tester('ntpath.relpath("a", "a")', '.') diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 5b2c7080e7..32ffd0acef 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -25,7 +25,7 @@ class TrivialTests(unittest.TestCase): self.assertRaises(ValueError, urllib2.urlopen, 'bogus url') # XXX Name hacking to get this to work on Windows. - fname = os.path.abspath(urllib2.__file__).replace('\\', '/') + fname = os.path.abspath(urllib2.__file__).replace(os.sep, '/') # And more hacking to get it to work on MacOS. This assumes # urllib.pathname2url works, unfortunately... -- 2.50.1