diff options
author | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:18:39 -0800 |
---|---|---|
committer | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:18:39 -0800 |
commit | 731cca110f376cdbaffb536e42d6c9d6da574fa8 (patch) | |
tree | 9cb95caf6f8b933115820bf699725d9cd600d2df /Lib/test/test_ntpath.py | |
parent | da79bcf8ac7ae72218ab023e1ed54390bc1a3a27 (diff) | |
parent | c8102f4d974669f4c5e4ca7bcd73292a1ac5bcbf (diff) | |
download | cpython-731cca110f376cdbaffb536e42d6c9d6da574fa8.tar.gz |
Issue #29371: merge with 3.6
Diffstat (limited to 'Lib/test/test_ntpath.py')
-rw-r--r-- | Lib/test/test_ntpath.py | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index 90edb6d080..15215e497d 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -72,29 +72,6 @@ class TestNtpath(unittest.TestCase): self.assertEqual(ntpath.splitdrive('//conky/MOUNTPOİNT/foo/bar'), ('//conky/MOUNTPOİNT', '/foo/bar')) - def test_splitunc(self): - with self.assertWarns(DeprecationWarning): - ntpath.splitunc('') - with support.check_warnings(('', DeprecationWarning)): - tester('ntpath.splitunc("c:\\foo\\bar")', - ('', 'c:\\foo\\bar')) - tester('ntpath.splitunc("c:/foo/bar")', - ('', 'c:/foo/bar')) - tester('ntpath.splitunc("\\\\conky\\mountpoint\\foo\\bar")', - ('\\\\conky\\mountpoint', '\\foo\\bar')) - tester('ntpath.splitunc("//conky/mountpoint/foo/bar")', - ('//conky/mountpoint', '/foo/bar')) - tester('ntpath.splitunc("\\\\\\conky\\mountpoint\\foo\\bar")', - ('', '\\\\\\conky\\mountpoint\\foo\\bar')) - tester('ntpath.splitunc("///conky/mountpoint/foo/bar")', - ('', '///conky/mountpoint/foo/bar')) - tester('ntpath.splitunc("\\\\conky\\\\mountpoint\\foo\\bar")', - ('', '\\\\conky\\\\mountpoint\\foo\\bar')) - tester('ntpath.splitunc("//conky//mountpoint/foo/bar")', - ('', '//conky//mountpoint/foo/bar')) - self.assertEqual(ntpath.splitunc('//conky/MOUNTPOİNT/foo/bar'), - ('//conky/MOUNTPOİNT', '/foo/bar')) - def test_split(self): tester('ntpath.split("c:\\foo\\bar")', ('c:\\foo', 'bar')) tester('ntpath.split("\\\\conky\\mountpoint\\foo\\bar")', @@ -449,7 +426,7 @@ class TestNtpath(unittest.TestCase): class NtCommonTest(test_genericpath.CommonTest, unittest.TestCase): pathmodule = ntpath - attributes = ['relpath', 'splitunc'] + attributes = ['relpath'] class PathLikeTests(unittest.TestCase): |