Cosmetic: break the long lines in test_ntpath.py, and get rid of its

expected-output file.

diff --git a/Lib/test/output/test_ntpath b/Lib/test/output/test_ntpath
deleted file mode 100644 (file)
index 92caf34..0000000
--- a/Lib/test/output/test_ntpath
+++ /dev/null
@@ -1,2 +0,0 @@
-test_ntpath
-No errors.  Thank your lucky stars.

diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index 7867fd9cfa1757c038443de4daab955c8f2326f6..b0c1b7c5ad4ea7e093c49af0e7706db0c0fa5aa4 100644 (file)
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -1,4 +1,5 @@
 import ntpath
+from test_support import verbose
 import os
 
 errors = 0
@@ -15,16 +16,22 @@ def tester(fn, wantResult):
         global errors
         errors = errors + 1
 
-tester('ntpath.splitdrive("c:\\foo\\bar")', ('c:', '\\foo\\bar'))
-tester('ntpath.splitunc("\\\\conky\\mountpoint\\foo\\bar")', ('\\\\conky\\mountpoint', '\\foo\\bar'))
-tester('ntpath.splitdrive("c:/foo/bar")', ('c:', '/foo/bar'))
-tester('ntpath.splitunc("//conky/mountpoint/foo/bar")', ('//conky/mountpoint', '/foo/bar'))
+tester('ntpath.splitdrive("c:\\foo\\bar")',
+       ('c:', '\\foo\\bar'))
+tester('ntpath.splitunc("\\\\conky\\mountpoint\\foo\\bar")',
+       ('\\\\conky\\mountpoint', '\\foo\\bar'))
+tester('ntpath.splitdrive("c:/foo/bar")',
+       ('c:', '/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("\\\\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', ''))
@@ -45,5 +52,5 @@ tester('ntpath.commonprefix(["/home/swen/spam", "/home/swen/spam"])',
 
 if errors:
     print str(errors) + " errors."
-else:
+elif verbose:
     print "No errors.  Thank your lucky stars."