[Python-checkins] cpython (merge 3.3 -> default): Issue #16923: Fix ResourceWarnings in test_ssl.

Sat Jan 12 21:59:30 CET 2013

http://hg.python.org/cpython/rev/f79d282c8147
changeset: 81466:f79d282c8147
parent: 81464:44e614446f78
parent: 81465:2c3f5ed7a5c9
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sat Jan 12 21:56:56 2013 +0100
summary:
 Issue #16923: Fix ResourceWarnings in test_ssl.
files:
 Lib/test/test_ssl.py | 68 ++++++++++++++++---------------
 Misc/NEWS | 2 +
 2 files changed, 37 insertions(+), 33 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
@@ -217,20 +217,21 @@
 s = socket.socket(socket.AF_INET)
 ss = ssl.wrap_socket(s)
 wr = weakref.ref(ss)
- del ss
- self.assertEqual(wr(), None)
+ with support.check_warnings(("", ResourceWarning)):
+ del ss
+ self.assertEqual(wr(), None)
 
 def test_wrapped_unconnected(self):
 # Methods on an unconnected SSLSocket propagate the original
 # OSError raise by the underlying socket object.
 s = socket.socket(socket.AF_INET)
- ss = ssl.wrap_socket(s)
- self.assertRaises(OSError, ss.recv, 1)
- self.assertRaises(OSError, ss.recv_into, bytearray(b'x'))
- self.assertRaises(OSError, ss.recvfrom, 1)
- self.assertRaises(OSError, ss.recvfrom_into, bytearray(b'x'), 1)
- self.assertRaises(OSError, ss.send, b'x')
- self.assertRaises(OSError, ss.sendto, b'x', ('0.0.0.0', 0))
+ with ssl.wrap_socket(s) as ss:
+ self.assertRaises(OSError, ss.recv, 1)
+ self.assertRaises(OSError, ss.recv_into, bytearray(b'x'))
+ self.assertRaises(OSError, ss.recvfrom, 1)
+ self.assertRaises(OSError, ss.recvfrom_into, bytearray(b'x'), 1)
+ self.assertRaises(OSError, ss.send, b'x')
+ self.assertRaises(OSError, ss.sendto, b'x', ('0.0.0.0', 0))
 
 def test_timeout(self):
 # Issue #8524: when creating an SSL socket, the timeout of the
@@ -238,8 +239,8 @@
 for timeout in (None, 0.0, 5.0):
 s = socket.socket(socket.AF_INET)
 s.settimeout(timeout)
- ss = ssl.wrap_socket(s)
- self.assertEqual(timeout, ss.gettimeout())
+ with ssl.wrap_socket(s) as ss:
+ self.assertEqual(timeout, ss.gettimeout())
 
 def test_errors(self):
 sock = socket.socket()
@@ -252,9 +253,9 @@
 self.assertRaisesRegex(ValueError,
 "certfile must be specified for server-side operations",
 ssl.wrap_socket, sock, server_side=True, certfile="")
- s = ssl.wrap_socket(sock, server_side=True, certfile=CERTFILE)
- self.assertRaisesRegex(ValueError, "can't connect in server-side mode",
- s.connect, (HOST, 8080))
+ with ssl.wrap_socket(sock, server_side=True, certfile=CERTFILE) as s:
+ self.assertRaisesRegex(ValueError, "can't connect in server-side mode",
+ s.connect, (HOST, 8080))
 with self.assertRaises(OSError) as cm:
 with socket.socket() as sock:
 ssl.wrap_socket(sock, certfile=WRONGCERT)
@@ -367,21 +368,21 @@
 def test_unknown_channel_binding(self):
 # should raise ValueError for unknown type
 s = socket.socket(socket.AF_INET)
- ss = ssl.wrap_socket(s)
- with self.assertRaises(ValueError):
- ss.get_channel_binding("unknown-type")
+ with ssl.wrap_socket(s) as ss:
+ with self.assertRaises(ValueError):
+ ss.get_channel_binding("unknown-type")
 
 @unittest.skipUnless("tls-unique" in ssl.CHANNEL_BINDING_TYPES,
 "'tls-unique' channel binding not available")
 def test_tls_unique_channel_binding(self):
 # unconnected should return None for known type
 s = socket.socket(socket.AF_INET)
- ss = ssl.wrap_socket(s)
- self.assertIsNone(ss.get_channel_binding("tls-unique"))
+ with ssl.wrap_socket(s) as ss:
+ self.assertIsNone(ss.get_channel_binding("tls-unique"))
 # the same for server-side
 s = socket.socket(socket.AF_INET)
- ss = ssl.wrap_socket(s, server_side=True, certfile=CERTFILE)
- self.assertIsNone(ss.get_channel_binding("tls-unique"))
+ with ssl.wrap_socket(s, server_side=True, certfile=CERTFILE) as ss:
+ self.assertIsNone(ss.get_channel_binding("tls-unique"))
 
 def test_dealloc_warn(self):
 ss = ssl.wrap_socket(socket.socket(socket.AF_INET))
@@ -660,10 +661,10 @@
 with socket.socket() as s:
 s.bind(("127.0.0.1", 0))
 s.listen(5)
- with socket.socket() as c:
- c.connect(s.getsockname())
- c.setblocking(False)
- c = ctx.wrap_socket(c, False, do_handshake_on_connect=False)
+ c = socket.socket()
+ c.connect(s.getsockname())
+ c.setblocking(False)
+ with ctx.wrap_socket(c, False, do_handshake_on_connect=False) as c:
 with self.assertRaises(ssl.SSLWantReadError) as cm:
 c.do_handshake()
 s = str(cm.exception)
@@ -904,12 +905,12 @@
 def test_ciphers(self):
 remote = ("svn.python.org", 443)
 with support.transient_internet(remote[0]):
- s = ssl.wrap_socket(socket.socket(socket.AF_INET),
- cert_reqs=ssl.CERT_NONE, ciphers="ALL")
- s.connect(remote)
- s = ssl.wrap_socket(socket.socket(socket.AF_INET),
- cert_reqs=ssl.CERT_NONE, ciphers="DEFAULT")
- s.connect(remote)
+ with ssl.wrap_socket(socket.socket(socket.AF_INET),
+ cert_reqs=ssl.CERT_NONE, ciphers="ALL") as s:
+ s.connect(remote)
+ with ssl.wrap_socket(socket.socket(socket.AF_INET),
+ cert_reqs=ssl.CERT_NONE, ciphers="DEFAULT") as s:
+ s.connect(remote)
 # Error checking can happen at instantiation or when connecting
 with self.assertRaisesRegex(ssl.SSLError, "No cipher can be selected"):
 with socket.socket(socket.AF_INET) as sock:
@@ -1886,6 +1887,8 @@
 client_addr = client.getsockname()
 client.close()
 t.join()
+ remote.close()
+ server.close()
 # Sanity checks.
 self.assertIsInstance(remote, ssl.SSLSocket)
 self.assertEqual(peer, client_addr)
@@ -1900,8 +1903,7 @@
 with ThreadedEchoServer(CERTFILE,
 ssl_version=ssl.PROTOCOL_SSLv23,
 chatty=False) as server:
- with socket.socket() as sock:
- s = context.wrap_socket(sock)
+ with context.wrap_socket(socket.socket()) as s:
 with self.assertRaises(OSError):
 s.connect((HOST, server.port))
 self.assertIn("no shared cipher", str(server.conn_errors[0]))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -635,6 +635,8 @@
 Tests
 -----
 
+- Issue #16923: Fix ResourceWarnings in test_ssl.
+
 - Issue #15539: Added regression tests for Tools/scripts/pindent.py.
 
 - Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
-- 
Repository URL: http://hg.python.org/cpython
