[Python-checkins] Make StreamServer.close() tests more robust (GH-13790)
Yury Selivanov
webhook-mailer at python.org
Tue Jun 4 07:37:23 EDT 2019
https://github.com/python/cpython/commit/35890abb8da7848919d70790f73fa091d7f98769
commit: 35890abb8da7848919d70790f73fa091d7f98769
branch: master
author: Andrew Svetlov <andrew.svetlov at gmail.com>
committer: Yury Selivanov <yury at magic.io>
date: 2019-06-04T13:37:10+02:00
summary:
Make StreamServer.close() tests more robust (GH-13790)
files:
M Lib/test/test_asyncio/test_streams.py
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index c1b9dc95ee62..e484746432af 100644
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -1507,10 +1507,14 @@ def test_stream_server_close(self):
def test_stream_server_abort(self):
server_stream_aborted = False
- fut = self.loop.create_future()
+ fut1 = self.loop.create_future()
+ fut2 = self.loop.create_future()
async def handle_client(stream):
- await fut
+ data = await stream.readexactly(4)
+ self.assertEqual(b'data', data)
+ fut1.set_result(None)
+ await fut2
self.assertEqual(b'', await stream.readline())
nonlocal server_stream_aborted
server_stream_aborted = True
@@ -1518,7 +1522,8 @@ def test_stream_server_abort(self):
async def client(srv):
addr = srv.sockets[0].getsockname()
stream = await asyncio.connect(*addr)
- fut.set_result(None)
+ await stream.write(b'data')
+ await fut2
self.assertEqual(b'', await stream.readline())
await stream.close()
@@ -1526,7 +1531,8 @@ def test_stream_server_abort(self):
async with asyncio.StreamServer(handle_client, '127.0.0.1', 0) as server:
await server.start_serving()
task = asyncio.create_task(client(server))
- await fut
+ await fut1
+ fut2.set_result(None)
await server.abort()
await task
@@ -1534,21 +1540,31 @@ def test_stream_server_abort(self):
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
self.loop.run_until_complete(test())
self.assertEqual(messages, [])
- self.assertTrue(fut.done())
+ self.assertTrue(fut1.done())
+ self.assertTrue(fut2.done())
self.assertTrue(server_stream_aborted)
def test_stream_shutdown_hung_task(self):
fut1 = self.loop.create_future()
fut2 = self.loop.create_future()
+ cancelled = self.loop.create_future()
async def handle_client(stream):
- while True:
- await asyncio.sleep(0.01)
+ data = await stream.readexactly(4)
+ self.assertEqual(b'data', data)
+ fut1.set_result(None)
+ await fut2
+ try:
+ while True:
+ await asyncio.sleep(0.01)
+ except asyncio.CancelledError:
+ cancelled.set_result(None)
+ raise
async def client(srv):
addr = srv.sockets[0].getsockname()
stream = await asyncio.connect(*addr)
- fut1.set_result(None)
+ await stream.write(b'data')
await fut2
self.assertEqual(b'', await stream.readline())
await stream.close()
@@ -1561,9 +1577,10 @@ def test_stream_shutdown_hung_task(self):
await server.start_serving()
task = asyncio.create_task(client(server))
await fut1
- await server.close()
fut2.set_result(None)
+ await server.close()
await task
+ await cancelled
messages = []
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
@@ -1571,21 +1588,28 @@ def test_stream_shutdown_hung_task(self):
self.assertEqual(messages, [])
self.assertTrue(fut1.done())
self.assertTrue(fut2.done())
+ self.assertTrue(cancelled.done())
def test_stream_shutdown_hung_task_prevents_cancellation(self):
fut1 = self.loop.create_future()
fut2 = self.loop.create_future()
+ cancelled = self.loop.create_future()
do_handle_client = True
async def handle_client(stream):
+ data = await stream.readexactly(4)
+ self.assertEqual(b'data', data)
+ fut1.set_result(None)
+ await fut2
while do_handle_client:
with contextlib.suppress(asyncio.CancelledError):
await asyncio.sleep(0.01)
+ cancelled.set_result(None)
async def client(srv):
addr = srv.sockets[0].getsockname()
stream = await asyncio.connect(*addr)
- fut1.set_result(None)
+ await stream.write(b'data')
await fut2
self.assertEqual(b'', await stream.readline())
await stream.close()
@@ -1598,11 +1622,12 @@ def test_stream_shutdown_hung_task_prevents_cancellation(self):
await server.start_serving()
task = asyncio.create_task(client(server))
await fut1
+ fut2.set_result(None)
await server.close()
nonlocal do_handle_client
do_handle_client = False
- fut2.set_result(None)
await task
+ await cancelled
messages = []
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
@@ -1612,6 +1637,7 @@ def test_stream_shutdown_hung_task_prevents_cancellation(self):
"<Task pending .+ ignored cancellation request")
self.assertTrue(fut1.done())
self.assertTrue(fut2.done())
+ self.assertTrue(cancelled.done())
def test_sendfile(self):
messages = []
More information about the Python-checkins
mailing list