mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Issue #27223: aio: Fix _read_ready and _write_ready to respect _conn_lost.
Patch by Łukasz Langa.
This commit is contained in:
parent
8ace13be39
commit
ca2e0a48cf
3 changed files with 29 additions and 18 deletions
|
@ -1087,17 +1087,6 @@ class SelectorSocketTransportTests(test_utils.TestCase):
|
|||
err,
|
||||
'Fatal write error on socket transport')
|
||||
|
||||
@mock.patch('asyncio.base_events.logger')
|
||||
def test_write_ready_exception_and_close(self, m_log):
|
||||
self.sock.send.side_effect = OSError()
|
||||
remove_writer = self.loop.remove_writer = mock.Mock()
|
||||
|
||||
transport = self.socket_transport()
|
||||
transport.close()
|
||||
transport._buffer.extend(b'data')
|
||||
transport._write_ready()
|
||||
remove_writer.assert_called_with(self.sock_fd)
|
||||
|
||||
def test_write_eof(self):
|
||||
tr = self.socket_transport()
|
||||
self.assertTrue(tr.can_write_eof())
|
||||
|
@ -1121,6 +1110,14 @@ class SelectorSocketTransportTests(test_utils.TestCase):
|
|||
self.sock.shutdown.assert_called_with(socket.SHUT_WR)
|
||||
tr.close()
|
||||
|
||||
@mock.patch('asyncio.base_events.logger')
|
||||
def test_transport_close_remove_writer(self, m_log):
|
||||
remove_writer = self.loop.remove_writer = mock.Mock()
|
||||
|
||||
transport = self.socket_transport()
|
||||
transport.close()
|
||||
remove_writer.assert_called_with(self.sock_fd)
|
||||
|
||||
|
||||
@unittest.skipIf(ssl is None, 'No ssl module')
|
||||
class SelectorSslTransportTests(test_utils.TestCase):
|
||||
|
@ -1175,7 +1172,7 @@ class SelectorSslTransportTests(test_utils.TestCase):
|
|||
self.sslsock.do_handshake.side_effect = exc
|
||||
with test_utils.disable_logger():
|
||||
waiter = asyncio.Future(loop=self.loop)
|
||||
transport = self.ssl_transport(waiter=waiter)
|
||||
self.ssl_transport(waiter=waiter)
|
||||
self.assertTrue(waiter.done())
|
||||
self.assertIs(exc, waiter.exception())
|
||||
self.assertTrue(self.sslsock.close.called)
|
||||
|
@ -1374,20 +1371,19 @@ class SelectorSslTransportTests(test_utils.TestCase):
|
|||
def test_write_ready_send_closing(self):
|
||||
self.sslsock.send.return_value = 4
|
||||
transport = self._make_one()
|
||||
transport.close()
|
||||
transport._buffer = list_to_buffer([b'data'])
|
||||
transport.close()
|
||||
transport._write_ready()
|
||||
self.assertFalse(self.loop.writers)
|
||||
self.protocol.connection_lost.assert_called_with(None)
|
||||
|
||||
def test_write_ready_send_closing_empty_buffer(self):
|
||||
self.sslsock.send.return_value = 4
|
||||
call_soon = self.loop.call_soon = mock.Mock()
|
||||
transport = self._make_one()
|
||||
transport.close()
|
||||
transport._buffer = list_to_buffer()
|
||||
transport.close()
|
||||
transport._write_ready()
|
||||
self.assertFalse(self.loop.writers)
|
||||
self.protocol.connection_lost.assert_called_with(None)
|
||||
call_soon.assert_called_with(transport._call_connection_lost, None)
|
||||
|
||||
def test_write_ready_send_retry(self):
|
||||
transport = self._make_one()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue