[Python-checkins] bpo-36801: Temporarily fix regression in writer.drain() (#13330)
Andrew Svetlov
webhook-mailer at python.org
Tue May 14 17:39:19 EDT 2019
https://github.com/python/cpython/commit/54b74fe9df89f0e5646736f1f60376b4e37c422c
commit: 54b74fe9df89f0e5646736f1f60376b4e37c422c
branch: master
author: Andrew Svetlov <andrew.svetlov at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-05-15T00:39:13+03:00
summary:
bpo-36801: Temporarily fix regression in writer.drain() (#13330)
files:
M Lib/asyncio/streams.py
M Lib/test/test_asyncio/test_streams.py
diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py
index 146a33818d95..2f0cbfdbe852 100644
--- a/Lib/asyncio/streams.py
+++ b/Lib/asyncio/streams.py
@@ -439,9 +439,7 @@ def get_extra_info(self, name, default=None):
# 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()
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index 8d6a1d26ac19..258d8a7f7fdf 100644
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -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))
More information about the Python-checkins
mailing list