From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 28 Jan 2012 16:40:23 +0000 (+0100)
Subject: Issue #13895: fix test_ssl hanging under Ubuntu
X-Git-Tag: v3.3.0a1~287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce816a51112afb28d1a7ea7e2e10af749be9ff28;p=python

Issue #13895: fix test_ssl hanging under Ubuntu
---

ce816a51112afb28d1a7ea7e2e10af749be9ff28
diff --cc Lib/test/test_ssl.py
index 6439441783,1b08f2e7dc..33f06d6cab
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@@ -1198,33 -1078,28 +1198,33 @@@ else
                                      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)]:
-                 if connectionchatty:
-                     if support.verbose:
-                         sys.stdout.write(
-                             " client:  sending %r...\n" % indata)
-                 s.write(arg)
-                 outdata = s.read()
+             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:  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):