mirror of https://github.com/python/cpython
Changed test so it no longer runs as a side effect of importing.
This commit is contained in:
Jerry Seutter
parent
9f7af8d4da
commit
fc7b3e3aa2
|
|
@ -1,123 +1,131 @@
|
||||||
import ntpath
|
import ntpath
|
||||||
from test.test_support import verbose, TestFailed
|
|
||||||
import os
|
import os
|
||||||
|
from test.test_support import verbose, TestFailed
|
||||||
|
import test.test_support as test_support
|
||||||
|
import unittest
|
||||||
|
|
||||||
errors = 0
|
|
||||||
|
|
||||||
def tester(fn, wantResult):
|
def tester(fn, wantResult):
|
||||||
global errors
|
|
||||||
fn = fn.replace("\\", "\\\\")
|
fn = fn.replace("\\", "\\\\")
|
||||||
gotResult = eval(fn)
|
gotResult = eval(fn)
|
||||||
if wantResult != gotResult:
|
if wantResult != gotResult:
|
||||||
print "error!"
|
raise TestFailed, "%s should return: %s but returned: %s" \
|
||||||
print "evaluated: " + str(fn)
|
%(str(fn), str(wantResult), str(gotResult))
|
||||||
print "should be: " + str(wantResult)
|
|
||||||
print " returned: " + str(gotResult)
|
|
||||||
print ""
|
|
||||||
errors = errors + 1
|
|
||||||
|
|
||||||
tester('ntpath.splitext("foo.ext")', ('foo', '.ext'))
|
|
||||||
tester('ntpath.splitext("/foo/foo.ext")', ('/foo/foo', '.ext'))
|
|
||||||
tester('ntpath.splitext(".ext")', ('.ext', ''))
|
|
||||||
tester('ntpath.splitext("\\foo.ext\\foo")', ('\\foo.ext\\foo', ''))
|
|
||||||
tester('ntpath.splitext("foo.ext\\")', ('foo.ext\\', ''))
|
|
||||||
tester('ntpath.splitext("")', ('', ''))
|
|
||||||
tester('ntpath.splitext("foo.bar.ext")', ('foo.bar', '.ext'))
|
|
||||||
tester('ntpath.splitext("xx/foo.bar.ext")', ('xx/foo.bar', '.ext'))
|
|
||||||
tester('ntpath.splitext("xx\\foo.bar.ext")', ('xx\\foo.bar', '.ext'))
|
|
||||||
tester('ntpath.splitext("c:a/b\\c.d")', ('c:a/b\\c', '.d'))
|
|
||||||
|
|
||||||
tester('ntpath.splitdrive("c:\\foo\\bar")',
|
class TestNtpath(unittest.TestCase):
|
||||||
|
def test_splitext(self):
|
||||||
|
tester('ntpath.splitext("foo.ext")', ('foo', '.ext'))
|
||||||
|
tester('ntpath.splitext("/foo/foo.ext")', ('/foo/foo', '.ext'))
|
||||||
|
tester('ntpath.splitext(".ext")', ('.ext', ''))
|
||||||
|
tester('ntpath.splitext("\\foo.ext\\foo")', ('\\foo.ext\\foo', ''))
|
||||||
|
tester('ntpath.splitext("foo.ext\\")', ('foo.ext\\', ''))
|
||||||
|
tester('ntpath.splitext("")', ('', ''))
|
||||||
|
tester('ntpath.splitext("foo.bar.ext")', ('foo.bar', '.ext'))
|
||||||
|
tester('ntpath.splitext("xx/foo.bar.ext")', ('xx/foo.bar', '.ext'))
|
||||||
|
tester('ntpath.splitext("xx\\foo.bar.ext")', ('xx\\foo.bar', '.ext'))
|
||||||
|
tester('ntpath.splitext("c:a/b\\c.d")', ('c:a/b\\c', '.d'))
|
||||||
|
|
||||||
|
def test_splitdrive(self):
|
||||||
|
tester('ntpath.splitdrive("c:\\foo\\bar")',
|
||||||
('c:', '\\foo\\bar'))
|
('c:', '\\foo\\bar'))
|
||||||
tester('ntpath.splitunc("\\\\conky\\mountpoint\\foo\\bar")',
|
tester('ntpath.splitdrive("c:/foo/bar")',
|
||||||
('\\\\conky\\mountpoint', '\\foo\\bar'))
|
|
||||||
tester('ntpath.splitdrive("c:/foo/bar")',
|
|
||||||
('c:', '/foo/bar'))
|
('c:', '/foo/bar'))
|
||||||
tester('ntpath.splitunc("//conky/mountpoint/foo/bar")',
|
|
||||||
|
def test_splitunc(self):
|
||||||
|
tester('ntpath.splitunc("\\\\conky\\mountpoint\\foo\\bar")',
|
||||||
|
('\\\\conky\\mountpoint', '\\foo\\bar'))
|
||||||
|
tester('ntpath.splitunc("//conky/mountpoint/foo/bar")',
|
||||||
('//conky/mountpoint', '/foo/bar'))
|
('//conky/mountpoint', '/foo/bar'))
|
||||||
|
|
||||||
tester('ntpath.split("c:\\foo\\bar")', ('c:\\foo', 'bar'))
|
def test_split(self):
|
||||||
tester('ntpath.split("\\\\conky\\mountpoint\\foo\\bar")',
|
tester('ntpath.split("c:\\foo\\bar")', ('c:\\foo', 'bar'))
|
||||||
|
tester('ntpath.split("\\\\conky\\mountpoint\\foo\\bar")',
|
||||||
('\\\\conky\\mountpoint\\foo', 'bar'))
|
('\\\\conky\\mountpoint\\foo', 'bar'))
|
||||||
|
|
||||||
tester('ntpath.split("c:\\")', ('c:\\', ''))
|
tester('ntpath.split("c:\\")', ('c:\\', ''))
|
||||||
tester('ntpath.split("\\\\conky\\mountpoint\\")',
|
tester('ntpath.split("\\\\conky\\mountpoint\\")',
|
||||||
('\\\\conky\\mountpoint', ''))
|
('\\\\conky\\mountpoint', ''))
|
||||||
|
|
||||||
tester('ntpath.split("c:/")', ('c:/', ''))
|
tester('ntpath.split("c:/")', ('c:/', ''))
|
||||||
tester('ntpath.split("//conky/mountpoint/")', ('//conky/mountpoint', ''))
|
tester('ntpath.split("//conky/mountpoint/")', ('//conky/mountpoint', ''))
|
||||||
|
|
||||||
tester('ntpath.isabs("c:\\")', 1)
|
def test_isabs(self):
|
||||||
tester('ntpath.isabs("\\\\conky\\mountpoint\\")', 1)
|
tester('ntpath.isabs("c:\\")', 1)
|
||||||
tester('ntpath.isabs("\\foo")', 1)
|
tester('ntpath.isabs("\\\\conky\\mountpoint\\")', 1)
|
||||||
tester('ntpath.isabs("\\foo\\bar")', 1)
|
tester('ntpath.isabs("\\foo")', 1)
|
||||||
|
tester('ntpath.isabs("\\foo\\bar")', 1)
|
||||||
|
|
||||||
tester('ntpath.commonprefix(["/home/swenson/spam", "/home/swen/spam"])',
|
def test_commonprefix(self):
|
||||||
|
tester('ntpath.commonprefix(["/home/swenson/spam", "/home/swen/spam"])',
|
||||||
"/home/swen")
|
"/home/swen")
|
||||||
tester('ntpath.commonprefix(["\\home\\swen\\spam", "\\home\\swen\\eggs"])',
|
tester('ntpath.commonprefix(["\\home\\swen\\spam", "\\home\\swen\\eggs"])',
|
||||||
"\\home\\swen\\")
|
"\\home\\swen\\")
|
||||||
tester('ntpath.commonprefix(["/home/swen/spam", "/home/swen/spam"])',
|
tester('ntpath.commonprefix(["/home/swen/spam", "/home/swen/spam"])',
|
||||||
"/home/swen/spam")
|
"/home/swen/spam")
|
||||||
|
|
||||||
tester('ntpath.join("")', '')
|
def test_join(self):
|
||||||
tester('ntpath.join("", "", "")', '')
|
tester('ntpath.join("")', '')
|
||||||
tester('ntpath.join("a")', 'a')
|
tester('ntpath.join("", "", "")', '')
|
||||||
tester('ntpath.join("/a")', '/a')
|
tester('ntpath.join("a")', 'a')
|
||||||
tester('ntpath.join("\\a")', '\\a')
|
tester('ntpath.join("/a")', '/a')
|
||||||
tester('ntpath.join("a:")', 'a:')
|
tester('ntpath.join("\\a")', '\\a')
|
||||||
tester('ntpath.join("a:", "b")', 'a:b')
|
tester('ntpath.join("a:")', 'a:')
|
||||||
tester('ntpath.join("a:", "/b")', 'a:/b')
|
tester('ntpath.join("a:", "b")', 'a:b')
|
||||||
tester('ntpath.join("a:", "\\b")', 'a:\\b')
|
tester('ntpath.join("a:", "/b")', 'a:/b')
|
||||||
tester('ntpath.join("a", "/b")', '/b')
|
tester('ntpath.join("a:", "\\b")', 'a:\\b')
|
||||||
tester('ntpath.join("a", "\\b")', '\\b')
|
tester('ntpath.join("a", "/b")', '/b')
|
||||||
tester('ntpath.join("a", "b", "c")', 'a\\b\\c')
|
tester('ntpath.join("a", "\\b")', '\\b')
|
||||||
tester('ntpath.join("a\\", "b", "c")', 'a\\b\\c')
|
tester('ntpath.join("a", "b", "c")', 'a\\b\\c')
|
||||||
tester('ntpath.join("a", "b\\", "c")', 'a\\b\\c')
|
tester('ntpath.join("a\\", "b", "c")', 'a\\b\\c')
|
||||||
tester('ntpath.join("a", "b", "\\c")', '\\c')
|
tester('ntpath.join("a", "b\\", "c")', 'a\\b\\c')
|
||||||
tester('ntpath.join("d:\\", "\\pleep")', 'd:\\pleep')
|
tester('ntpath.join("a", "b", "\\c")', '\\c')
|
||||||
tester('ntpath.join("d:\\", "a", "b")', 'd:\\a\\b')
|
tester('ntpath.join("d:\\", "\\pleep")', 'd:\\pleep')
|
||||||
tester("ntpath.join('c:', '/a')", 'c:/a')
|
tester('ntpath.join("d:\\", "a", "b")', 'd:\\a\\b')
|
||||||
tester("ntpath.join('c:/', '/a')", 'c:/a')
|
tester("ntpath.join('c:', '/a')", 'c:/a')
|
||||||
tester("ntpath.join('c:/a', '/b')", '/b')
|
tester("ntpath.join('c:/', '/a')", 'c:/a')
|
||||||
tester("ntpath.join('c:', 'd:/')", 'd:/')
|
tester("ntpath.join('c:/a', '/b')", '/b')
|
||||||
tester("ntpath.join('c:/', 'd:/')", 'd:/')
|
tester("ntpath.join('c:', 'd:/')", 'd:/')
|
||||||
tester("ntpath.join('c:/', 'd:/a/b')", 'd:/a/b')
|
tester("ntpath.join('c:/', 'd:/')", 'd:/')
|
||||||
|
tester("ntpath.join('c:/', 'd:/a/b')", 'd:/a/b')
|
||||||
|
|
||||||
tester("ntpath.join('')", '')
|
tester("ntpath.join('')", '')
|
||||||
tester("ntpath.join('', '', '', '', '')", '')
|
tester("ntpath.join('', '', '', '', '')", '')
|
||||||
tester("ntpath.join('a')", 'a')
|
tester("ntpath.join('a')", 'a')
|
||||||
tester("ntpath.join('', 'a')", 'a')
|
tester("ntpath.join('', 'a')", 'a')
|
||||||
tester("ntpath.join('', '', '', '', 'a')", 'a')
|
tester("ntpath.join('', '', '', '', 'a')", 'a')
|
||||||
tester("ntpath.join('a', '')", 'a\\')
|
tester("ntpath.join('a', '')", 'a\\')
|
||||||
tester("ntpath.join('a', '', '', '', '')", 'a\\')
|
tester("ntpath.join('a', '', '', '', '')", 'a\\')
|
||||||
tester("ntpath.join('a\\', '')", 'a\\')
|
tester("ntpath.join('a\\', '')", 'a\\')
|
||||||
tester("ntpath.join('a\\', '', '', '', '')", 'a\\')
|
tester("ntpath.join('a\\', '', '', '', '')", 'a\\')
|
||||||
|
|
||||||
tester("ntpath.normpath('A//////././//.//B')", r'A\B')
|
def test_normpath(self):
|
||||||
tester("ntpath.normpath('A/./B')", r'A\B')
|
tester("ntpath.normpath('A//////././//.//B')", r'A\B')
|
||||||
tester("ntpath.normpath('A/foo/../B')", r'A\B')
|
tester("ntpath.normpath('A/./B')", r'A\B')
|
||||||
tester("ntpath.normpath('C:A//B')", r'C:A\B')
|
tester("ntpath.normpath('A/foo/../B')", r'A\B')
|
||||||
tester("ntpath.normpath('D:A/./B')", r'D:A\B')
|
tester("ntpath.normpath('C:A//B')", r'C:A\B')
|
||||||
tester("ntpath.normpath('e:A/foo/../B')", r'e:A\B')
|
tester("ntpath.normpath('D:A/./B')", r'D:A\B')
|
||||||
|
tester("ntpath.normpath('e:A/foo/../B')", r'e:A\B')
|
||||||
|
|
||||||
tester("ntpath.normpath('C:///A//B')", r'C:\A\B')
|
tester("ntpath.normpath('C:///A//B')", r'C:\A\B')
|
||||||
tester("ntpath.normpath('D:///A/./B')", r'D:\A\B')
|
tester("ntpath.normpath('D:///A/./B')", r'D:\A\B')
|
||||||
tester("ntpath.normpath('e:///A/foo/../B')", r'e:\A\B')
|
tester("ntpath.normpath('e:///A/foo/../B')", r'e:\A\B')
|
||||||
|
|
||||||
tester("ntpath.normpath('..')", r'..')
|
tester("ntpath.normpath('..')", r'..')
|
||||||
tester("ntpath.normpath('.')", r'.')
|
tester("ntpath.normpath('.')", r'.')
|
||||||
tester("ntpath.normpath('')", r'.')
|
tester("ntpath.normpath('')", r'.')
|
||||||
tester("ntpath.normpath('/')", '\\')
|
tester("ntpath.normpath('/')", '\\')
|
||||||
tester("ntpath.normpath('c:/')", 'c:\\')
|
tester("ntpath.normpath('c:/')", 'c:\\')
|
||||||
tester("ntpath.normpath('/../.././..')", '\\')
|
tester("ntpath.normpath('/../.././..')", '\\')
|
||||||
tester("ntpath.normpath('c:/../../..')", 'c:\\')
|
tester("ntpath.normpath('c:/../../..')", 'c:\\')
|
||||||
tester("ntpath.normpath('../.././..')", r'..\..\..')
|
tester("ntpath.normpath('../.././..')", r'..\..\..')
|
||||||
tester("ntpath.normpath('K:../.././..')", r'K:..\..\..')
|
tester("ntpath.normpath('K:../.././..')", r'K:..\..\..')
|
||||||
tester("ntpath.normpath('C:////a/b')", r'C:\a\b')
|
tester("ntpath.normpath('C:////a/b')", r'C:\a\b')
|
||||||
tester("ntpath.normpath('//machine/share//a/b')", r'\\machine\share\a\b')
|
tester("ntpath.normpath('//machine/share//a/b')", r'\\machine\share\a\b')
|
||||||
|
|
||||||
oldenv = os.environ.copy()
|
def test_expandvars(self):
|
||||||
try:
|
oldenv = os.environ.copy()
|
||||||
|
try:
|
||||||
os.environ.clear()
|
os.environ.clear()
|
||||||
os.environ["foo"] = "bar"
|
os.environ["foo"] = "bar"
|
||||||
os.environ["{foo"] = "baz1"
|
os.environ["{foo"] = "baz1"
|
||||||
|
|
@ -141,34 +149,39 @@ try:
|
||||||
tester('ntpath.expandvars("%?bar%")', "%?bar%")
|
tester('ntpath.expandvars("%?bar%")', "%?bar%")
|
||||||
tester('ntpath.expandvars("%foo%%bar")', "bar%bar")
|
tester('ntpath.expandvars("%foo%%bar")', "bar%bar")
|
||||||
tester('ntpath.expandvars("\'%foo%\'%bar")', "\'%foo%\'%bar")
|
tester('ntpath.expandvars("\'%foo%\'%bar")', "\'%foo%\'%bar")
|
||||||
finally:
|
finally:
|
||||||
os.environ.clear()
|
os.environ.clear()
|
||||||
os.environ.update(oldenv)
|
os.environ.update(oldenv)
|
||||||
|
|
||||||
# ntpath.abspath() can only be used on a system with the "nt" module
|
def test_abspath(self):
|
||||||
# (reasonably), so we protect this test with "import nt". This allows
|
# ntpath.abspath() can only be used on a system with the "nt" module
|
||||||
# the rest of the tests for the ntpath module to be run to completion
|
# (reasonably), so we protect this test with "import nt". This allows
|
||||||
# on any platform, since most of the module is intended to be usable
|
# the rest of the tests for the ntpath module to be run to completion
|
||||||
# from any platform.
|
# on any platform, since most of the module is intended to be usable
|
||||||
try:
|
# from any platform.
|
||||||
|
try:
|
||||||
import nt
|
import nt
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
tester('ntpath.abspath("C:\\")', "C:\\")
|
tester('ntpath.abspath("C:\\")', "C:\\")
|
||||||
|
|
||||||
currentdir = os.path.split(os.getcwd())[-1]
|
def test_relpath(self):
|
||||||
tester('ntpath.relpath("a")', 'a')
|
currentdir = os.path.split(os.getcwd())[-1]
|
||||||
tester('ntpath.relpath(os.path.abspath("a"))', 'a')
|
tester('ntpath.relpath("a")', 'a')
|
||||||
tester('ntpath.relpath("a/b")', 'a\\b')
|
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")', '..\\a\\b')
|
||||||
tester('ntpath.relpath("a/b", "../c")', '..\\'+currentdir+'\\a\\b')
|
tester('ntpath.relpath("a", "../b")', '..\\'+currentdir+'\\a')
|
||||||
tester('ntpath.relpath("a", "b/c")', '..\\..\\a')
|
tester('ntpath.relpath("a/b", "../c")', '..\\'+currentdir+'\\a\\b')
|
||||||
tester('ntpath.relpath("//conky/mountpoint/a", "//conky/mountpoint/b/c")', '..\\..\\a')
|
tester('ntpath.relpath("a", "b/c")', '..\\..\\a')
|
||||||
tester('ntpath.relpath("a", "a")', '.')
|
tester('ntpath.relpath("//conky/mountpoint/a", "//conky/mountpoint/b/c")', '..\\..\\a')
|
||||||
|
tester('ntpath.relpath("a", "a")', '.')
|
||||||
|
|
||||||
if errors:
|
|
||||||
raise TestFailed(str(errors) + " errors.")
|
def test_main():
|
||||||
elif verbose:
|
test_support.run_unittest(TestNtpath)
|
||||||
print "No errors. Thank your lucky stars."
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue