From: Tim Peters <tim.peters@gmail.com>
Date: Sat, 1 Apr 2006 01:31:04 +0000 (+0000)
Subject: Merge rev 43516 from trunk.
X-Git-Tag: v2.4.4c1~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a33a35e672015c3e5cfaf4da756233e424a1efea;p=thirdparty%2FPython%2Fcpython.git

Merge rev 43516 from trunk.

test_timeout():  Disable this new test on all platforms.

The

    s.connect(("gmail.org", 995))

line has been timing out on all buildbot slaves for hours
now, causing the test to fail.
---

diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py
index a43ca5e76b97..6ed0b094c325 100644
--- a/Lib/test/test_socket_ssl.py
+++ b/Lib/test/test_socket_ssl.py
@@ -28,23 +28,27 @@ def test_basic():
     buf = f.read()
     f.close()
 
-if not sys.platform.startswith('win'):
+# XXX Tim disabled this test on all platforms, for now, since the
+# XXX s.connect(("gmail.org", 995))
+# XXX line starting timing out on all the builbot slaves.
+if 0: not sys.platform.startswith('win'):
     def test_timeout():
         test_support.requires('network')
 
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         s.settimeout(30.0)
-        # connect to service which issues an welcome banner (without need to write anything)
+        # connect to service which issues an welcome banner (without need to
+        # write anything)
         s.connect(("gmail.org", 995))
         ss = socket.ssl(s)
-        # read part of return welcome banner twice,# read part of return welcome banner twice
+        # read part of return welcome banner twice
         ss.read(1)
         ss.read(1)
         s.close()
 else:
     def test_timeout():
         pass
-					    
+
 def test_rude_shutdown():
     try:
         import thread