diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-06-04 00:06:09 +0200 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-06-04 00:06:09 +0200 |
commit | 26262f85d31044403be08dae1fec9405d547c264 (patch) | |
tree | 6d941db27ec1cd15125b76a4024f084cbcb45c6a | |
parent | a21f0be3195142be38981d348234412ca42d9a75 (diff) | |
download | trollius-26262f85d31044403be08dae1fec9405d547c264.tar.gz |
Close sockets on errors
Fix ResourceWarning: BaseEventLoop.create_connection(),
BaseEventLoop.create_datagram_endpoint() and
_UnixSelectorEventLoop.create_unix_server() now close the newly created socket
on error.
-rw-r--r-- | asyncio/base_events.py | 8 | ||||
-rw-r--r-- | asyncio/unix_events.py | 3 | ||||
-rw-r--r-- | tests/test_base_events.py | 21 | ||||
-rw-r--r-- | tests/test_unix_events.py | 18 |
4 files changed, 50 insertions, 0 deletions
diff --git a/asyncio/base_events.py b/asyncio/base_events.py index 3d4a87a..1c7073c 100644 --- a/asyncio/base_events.py +++ b/asyncio/base_events.py @@ -412,6 +412,10 @@ class BaseEventLoop(events.AbstractEventLoop): if sock is not None: sock.close() exceptions.append(exc) + except: + if sock is not None: + sock.close() + raise else: break else: @@ -512,6 +516,10 @@ class BaseEventLoop(events.AbstractEventLoop): if sock is not None: sock.close() exceptions.append(exc) + except: + if sock is not None: + sock.close() + raise else: break else: diff --git a/asyncio/unix_events.py b/asyncio/unix_events.py index 1fbdd31..230fbc3 100644 --- a/asyncio/unix_events.py +++ b/asyncio/unix_events.py @@ -223,6 +223,9 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop): raise OSError(errno.EADDRINUSE, msg) from None else: raise + except: + sock.close() + raise else: if sock is None: raise ValueError( diff --git a/tests/test_base_events.py b/tests/test_base_events.py index 4ba9556..dbcd590 100644 --- a/tests/test_base_events.py +++ b/tests/test_base_events.py @@ -583,6 +583,27 @@ class BaseEventLoopWithSelectorTests(unittest.TestCase): self.assertEqual(str(cm.exception), 'Multiple exceptions: err1, err2') + @mock.patch('asyncio.base_events.socket') + def test_create_connection_timeout(self, m_socket): + # Ensure that the socket is closed on timeout + sock = mock.Mock() + m_socket.socket.return_value = sock + + def getaddrinfo(*args, **kw): + fut = asyncio.Future(loop=self.loop) + addr = (socket.AF_INET, socket.SOCK_STREAM, 0, '', + ('127.0.0.1', 80)) + fut.set_result([addr]) + return fut + self.loop.getaddrinfo = getaddrinfo + + with mock.patch.object(self.loop, 'sock_connect', + side_effect=asyncio.TimeoutError): + coro = self.loop.create_connection(MyProto, '127.0.0.1', 80) + with self.assertRaises(asyncio.TimeoutError) as cm: + self.loop.run_until_complete(coro) + self.assertTrue(sock.close.called) + def test_create_connection_host_port_sock(self): coro = self.loop.create_connection( MyProto, 'example.com', 80, sock=object()) diff --git a/tests/test_unix_events.py b/tests/test_unix_events.py index 744c319..cec7a11 100644 --- a/tests/test_unix_events.py +++ b/tests/test_unix_events.py @@ -256,6 +256,24 @@ class SelectorEventLoopUnixSocketTests(unittest.TestCase): 'A UNIX Domain Socket was expected'): self.loop.run_until_complete(coro) + @mock.patch('asyncio.unix_events.socket') + def test_create_unix_server_bind_error(self, m_socket): + # Ensure that the socket is closed on any bind error + sock = mock.Mock() + m_socket.socket.return_value = sock + + sock.bind.side_effect = OSError + coro = self.loop.create_unix_server(lambda: None, path="/test") + with self.assertRaises(OSError): + self.loop.run_until_complete(coro) + self.assertTrue(sock.close.called) + + sock.bind.side_effect = MemoryError + coro = self.loop.create_unix_server(lambda: None, path="/test") + with self.assertRaises(MemoryError): + self.loop.run_until_complete(coro) + self.assertTrue(sock.close.called) + def test_create_unix_connection_path_sock(self): coro = self.loop.create_unix_connection( lambda: None, '/dev/null', sock=object()) |