Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-36801: Temporarily fix regression in writer.drain() (#13330)

Browse source
This commit is contained in:
Andrew Svetlov 2019-05-15 00:39:13 +03:00 • committed by GitHub
parent 91c99873d1
commit 54b74fe9df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/asyncio/streams.py
View file

@ -439,9 +439,7 @@ async def drain(self):
# Wait for protocol.connection_lost() call
# Raise connection closing error if any,
# ConnectionResetError otherwise
fut = self._protocol._get_close_waiter(self)
await fut
raise ConnectionResetError('Connection lost')
await sleep(0)
await self._protocol._drain_helper()

23
Lib/test/test_asyncio/test_streams.py
View file

@ -109,29 +109,6 @@ def test_open_unix_connection_no_loop_ssl(self):
self._basetest_open_connection_no_loop_ssl(conn_fut)
@unittest.skipIf(ssl is None, 'No ssl module')
def test_drain_on_closed_writer_ssl(self):
async def inner(httpd):
reader, writer = await asyncio.open_connection(
*httpd.address,
ssl=test_utils.dummy_ssl_context())
messages = []
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
writer.write(b'GET / HTTP/1.0\r\n\r\n')
data = await reader.read()
self.assertTrue(data.endswith(b'\r\n\r\nTest message'))
writer.close()
with self.assertRaises(ConnectionResetError):
await writer.drain()
self.assertEqual(messages, [])
with test_utils.run_test_server(use_ssl=True) as httpd:
self.loop.run_until_complete(inner(httpd))
def _basetest_open_connection_error(self, open_connection_fut):
messages = []
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))