[Python-checkins] cpython (merge 3.2 -> default): Issue #13895: fix test_ssl hanging under Ubuntu

[antoine.pitrou]

http://hg.python.org/cpython/rev/db0c717cbc01
changeset:   74669:db0c717cbc01
parent:      74667:86452e102929
parent:      74668:10c79f29e417
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Jan 28 17:40:23 2012 +0100
summary:
  Issue #13895: fix test_ssl hanging under Ubuntu

files:
  Lib/test/test_ssl.py |  50 ++++++++++++++++----------------
  1 files changed, 25 insertions(+), 25 deletions(-)


diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1198,33 +1198,33 @@
                                     chatty=chatty,
                                     connectionchatty=False)
         with server:
-            s = client_context.wrap_socket(socket.socket())
-            s.connect((HOST, server.port))
-            for arg in [indata, bytearray(indata), memoryview(indata)]:
+            with client_context.wrap_socket(socket.socket()) as s:
+                s.connect((HOST, server.port))
+                for arg in [indata, bytearray(indata), memoryview(indata)]:
+                    if connectionchatty:
+                        if support.verbose:
+                            sys.stdout.write(
+                                " client:  sending %r...\n" % indata)
+                    s.write(arg)
+                    outdata = s.read()
+                    if connectionchatty:
+                        if support.verbose:
+                            sys.stdout.write(" client:  read %r\n" % outdata)
+                    if outdata != indata.lower():
+                        raise AssertionError(
+                            "bad data <<%r>> (%d) received; expected <<%r>> (%d)\n"
+                            % (outdata[:20], len(outdata),
+                               indata[:20].lower(), len(indata)))
+                s.write(b"over\n")
                 if connectionchatty:
                     if support.verbose:
-                        sys.stdout.write(
-                            " client:  sending %r...\n" % indata)
-                s.write(arg)
-                outdata = s.read()
-                if connectionchatty:
-                    if support.verbose:
-                        sys.stdout.write(" client:  read %r\n" % outdata)
-                if outdata != indata.lower():
-                    raise AssertionError(
-                        "bad data <<%r>> (%d) received; expected <<%r>> (%d)\n"
-                        % (outdata[:20], len(outdata),
-                           indata[:20].lower(), len(indata)))
-            s.write(b"over\n")
-            if connectionchatty:
-                if support.verbose:
-                    sys.stdout.write(" client:  closing connection.\n")
-            stats = {
-                'compression': s.compression(),
-                'cipher': s.cipher(),
-            }
-            s.close()
-            return stats
+                        sys.stdout.write(" client:  closing connection.\n")
+                stats = {
+                    'compression': s.compression(),
+                    'cipher': s.cipher(),
+                }
+                s.close()
+                return stats
 
     def try_protocol_combo(server_protocol, client_protocol, expect_success,
                            certsreqs=None, server_options=0, client_options=0):

-- 
Repository URL: http://hg.python.org/cpython