From: Guido van Rossum <guido@python.org>
Date: Tue, 6 Apr 1999 19:38:18 +0000 (+0000)
Subject: Fix the tests now that splitdrive() no longer treats UNC paths special.
X-Git-Tag: v1.5.2c1~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=630a9a68941205a7ebb8428fe4faeef82429d77d;p=thirdparty%2FPython%2Fcpython.git

Fix the tests now that splitdrive() no longer treats UNC paths special.
(Some tests converted to splitunc() tests.)
---

diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index 9c79865afaf3..1f824a584870 100644
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -16,18 +16,18 @@ def tester(fn, wantResult):
 		errors = errors + 1
 
 tester('ntpath.splitdrive("c:\\foo\\bar")', ('c:', '\\foo\\bar'))
-tester('ntpath.splitdrive("\\\\conky\\mountpoint\\foo\\bar")', ('\\\\conky\\mountpoint', '\\foo\\bar'))
+tester('ntpath.splitunc("\\\\conky\\mountpoint\\foo\\bar")', ('\\\\conky\\mountpoint', '\\foo\\bar'))
 tester('ntpath.splitdrive("c:/foo/bar")', ('c:', '/foo/bar'))
-tester('ntpath.splitdrive("//conky/mountpoint/foo/bar")', ('//conky/mountpoint', '/foo/bar'))
+tester('ntpath.splitunc("//conky/mountpoint/foo/bar")', ('//conky/mountpoint', '/foo/bar'))
 
 tester('ntpath.split("c:\\foo\\bar")', ('c:\\foo', 'bar'))
 tester('ntpath.split("\\\\conky\\mountpoint\\foo\\bar")', ('\\\\conky\\mountpoint\\foo', 'bar'))
 
 tester('ntpath.split("c:\\")', ('c:\\', ''))
-tester('ntpath.split("\\\\conky\\mountpoint\\")', ('\\\\conky\\mountpoint\\', ''))
+tester('ntpath.split("\\\\conky\\mountpoint\\")', ('\\\\conky\\mountpoint', ''))
 
 tester('ntpath.split("c:/")', ('c:/', ''))
-tester('ntpath.split("//conky/mountpoint/")', ('//conky/mountpoint/', ''))
+tester('ntpath.split("//conky/mountpoint/")', ('//conky/mountpoint', ''))
 
 tester('ntpath.isabs("c:\\")', 1)
 tester('ntpath.isabs("\\\\conky\\mountpoint\\")', 1)