Skip to content
Permalink
Browse files

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

  • Loading branch information
asvetlov committed May 14, 2019
1 parent 91c9987 commit 54b74fe9df89f0e5646736f1f60376b4e37c422c
Showing with 1 addition and 26 deletions.
  1. +1 −3 Lib/asyncio/streams.py
  2. +0 −23 Lib/test/test_asyncio/test_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()


@@ -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))

0 comments on commit 54b74fe

Please sign in to comment.
You can’t perform that action at this time.