Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #7665: Fixed tests test_ntpath and test_urllib2 when ran in the 

directory containing a backslash.
This commit is contained in:
Serhiy Storchaka 2015-01-26 10:26:14 +02:00
parent 624caf7bcb
commit 5106d044ec
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_ntpath.py
View File

@ -306,13 +306,14 @@ class TestNtpath(unittest.TestCase):
self.skipTest('nt module not available') self.skipTest('nt module not available')
def test_relpath(self): def test_relpath(self):
currentdir = os.path.split(os.getcwd())[-1]
tester('ntpath.relpath("a")', 'a') tester('ntpath.relpath("a")', 'a')
tester('ntpath.relpath(os.path.abspath("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")', '..\\a\\b') tester('ntpath.relpath("../a/b")', '..\\a\\b')
tester('ntpath.relpath("a", "../b")', '..\\'+currentdir+'\\a') with support.temp_cwd(support.TESTFN) as cwd_dir:
tester('ntpath.relpath("a/b", "../c")', '..\\'+currentdir+'\\a\\b') 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("a", "b/c")', '..\\..\\a')
tester('ntpath.relpath("c:/foo/bar/bat", "c:/x/y")', '..\\..\\foo\\bar\\bat') tester('ntpath.relpath("c:/foo/bar/bat", "c:/x/y")', '..\\..\\foo\\bar\\bat')
tester('ntpath.relpath("//conky/mountpoint/a", "//conky/mountpoint/b/c")', '..\\..\\a') tester('ntpath.relpath("//conky/mountpoint/a", "//conky/mountpoint/b/c")', '..\\..\\a')

2
Lib/test/test_urllib2.py
View File

@ -44,7 +44,7 @@ class TrivialTests(unittest.TestCase):
self.assertRaises(ValueError, urllib.request.urlopen, 'bogus url') self.assertRaises(ValueError, urllib.request.urlopen, 'bogus url')
# XXX Name hacking to get this to work on Windows. # XXX Name hacking to get this to work on Windows.
fname = os.path.abspath(urllib.request.__file__).replace('\\', '/') fname = os.path.abspath(urllib.request.__file__).replace(os.sep, '/')
if os.name == 'nt': if os.name == 'nt':
file_url = "file:///%s" % fname file_url = "file:///%s" % fname