This should fix the buildbot failure on s/390 which can't connect to gmail.org.

It makes the error message consistent and always sends to stderr.

It would be much better for all the networking tests to hit only python.org.

diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py
index 41eab69d8f594c5379a3028cd8b025d8e8c13b2c..3c9c9f03c0eb5ab4b73edb97c2efcaf071a199bc 100644 (file)
--- a/Lib/test/test_socket_ssl.py
+++ b/Lib/test/test_socket_ssl.py
@@ -34,6 +34,13 @@ def test_basic():
 def test_timeout():
     test_support.requires('network')
 
+    def error_msg(extra_msg):
+        print >> sys.stderr, """\
+    WARNING:  an attempt to connect to %r %s, in
+    test_timeout.  That may be legitimate, but is not the outcome we hoped
+    for.  If this message is seen often, test_timeout should be changed to
+    use a more reliable address.""" % (ADDR, extra_msg)
+
     if test_support.verbose:
         print "test_timeout ..."
 
@@ -49,15 +56,11 @@ def test_timeout():
     try:
         s.connect(ADDR)
     except socket.timeout:
-        print >> sys.stderr, """\
-    WARNING:  an attempt to connect to %r timed out, in
-    test_timeout.  That may be legitimate, but is not the outcome we hoped
-    for.  If this message is seen often, test_timeout should be changed to
-    use a more reliable address.""" % (ADDR,)
+        error_msg('timed out')
         return
     except socket.error, exc:  # In case connection is refused.
         if exc.args[0] == errno.ECONNREFUSED:
-            print "Connection refused when connecting to", ADDR
+            error_msg('was refused')
             return
         else:
             raise