mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 05:35:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-35065: Remove StreamReaderProtocol._untrack_reader (#10212)

Browse source 
The call to `_untrack_reader` is performed too soon, causing the protocol
to forget about the reader before `connection_lost` can run and feed the
EOF to the reader. See bpo-35065.
This commit is contained in:
Vincent Michel 2018-11-08 13:21:47 +01:00 • committed by Andrew Svetlov
parent 5d95312fb8
commit fd512d7645
4 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -589,6 +589,7 @@ class StreamTests(test_utils.TestCase):
client_writer.write(data)
await client_writer.drain()
client_writer.close()
await client_writer.wait_closed()
def start(self):
sock = socket.socket()
@ -628,6 +629,7 @@ class StreamTests(test_utils.TestCase):
# read it back
msgback = await reader.readline()
writer.close()
await writer.wait_closed()
return msgback
messages = []
@ -666,6 +668,7 @@ class StreamTests(test_utils.TestCase):
client_writer.write(data)
await client_writer.drain()
client_writer.close()
await client_writer.wait_closed()
def start(self):
self.server = self.loop.run_until_complete(
@ -697,6 +700,7 @@ class StreamTests(test_utils.TestCase):
# read it back
msgback = await reader.readline()
writer.close()
await writer.wait_closed()
return msgback
messages = []
@ -987,6 +991,25 @@ os.close(fd)
self.assertEqual(messages, [])
def test_eof_feed_when_closing_writer(self):
# See http://bugs.python.org/issue35065
messages = []
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
with test_utils.run_test_server() as httpd:
rd, wr = self.loop.run_until_complete(
asyncio.open_connection(*httpd.address,
loop=self.loop))
f = wr.aclose()
self.loop.run_until_complete(f)
assert rd.at_eof()
f = rd.read()
data = self.loop.run_until_complete(f)
assert data == b''
self.assertEqual(messages, [])
if __name__ == '__main__':
unittest.main()