Backport Guido's checkin 1.3:

Should raise TestSkipped, not ImportError, when deciding to skip the
test.

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index b2d9661096235736161a2771aa68349c7e0d4bfa..398b077c8d190ea80f4e5bc3300a7aad77f5dca2 100644 (file)
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -3,9 +3,9 @@
 # XXX This must be run manually -- somehow the I/O redirection of the
 # regression test breaks the test.
 
-from test_support import verbose, verify, TESTFN
+from test_support import verbose, verify, TESTFN, TestSkipped
 if not verbose:
-    raise ImportError, "test_socketserver can only be run manually"
+    raise TestSkipped, "test_socketserver can only be run manually"
 
 from SocketServer import *
 import socket