mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-47076: Make asyncio.Queue stable on slow test boxes (GH-32040)

Browse source
This commit is contained in:
Andrew Svetlov 2022-03-22 16:00:23 +02:00 • committed by GitHub
parent 49daf6dba8
commit 673755bfba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Lib/test/test_asyncio/test_queues.py
View file

@ -28,7 +28,7 @@ class QueueBasicTests(unittest.IsolatedAsyncioTestCase):
# Start a task that waits to get. # Start a task that waits to get.
getter = tg.create_task(q.get()) getter = tg.create_task(q.get())
# Let it start waiting. # Let it start waiting.
await asyncio.sleep(0.1) await asyncio.sleep(0)
self.assertTrue('_getters[1]' in fn(q)) self.assertTrue('_getters[1]' in fn(q))
# resume q.get coroutine to finish generator # resume q.get coroutine to finish generator
q.put_nowait(0) q.put_nowait(0)
@ -42,7 +42,7 @@ class QueueBasicTests(unittest.IsolatedAsyncioTestCase):
# Start a task that waits to put. # Start a task that waits to put.
putter = tg.create_task(q.put(2)) putter = tg.create_task(q.put(2))
# Let it start waiting. # Let it start waiting.
await asyncio.sleep(0.1) await asyncio.sleep(0)
self.assertTrue('_putters[1]' in fn(q)) self.assertTrue('_putters[1]' in fn(q))
# resume q.put coroutine to finish generator # resume q.put coroutine to finish generator
q.get_nowait() q.get_nowait()
@ -100,14 +100,15 @@ class QueueBasicTests(unittest.IsolatedAsyncioTestCase):
return True return True
t = asyncio.create_task(putter()) t = asyncio.create_task(putter())
await asyncio.sleep(0.01) for i in range(2):
await asyncio.sleep(0)
# The putter is blocked after putting two items. # The putter is blocked after putting two items.
self.assertEqual([0, 1], have_been_put) self.assertEqual([0, 1], have_been_put)
self.assertEqual(0, await q.get()) self.assertEqual(0, await q.get())
# Let the putter resume and put last item. # Let the putter resume and put last item.
await asyncio.sleep(0.01) await asyncio.sleep(0)
self.assertEqual([0, 1, 2], have_been_put) self.assertEqual([0, 1, 2], have_been_put)
self.assertEqual(1, await q.get()) self.assertEqual(1, await q.get())
self.assertEqual(2, await q.get()) self.assertEqual(2, await q.get())
@ -150,10 +151,10 @@ class QueueGetTests(unittest.IsolatedAsyncioTestCase):
finished = True finished = True
return res return res
loop.call_later(0.01, q.put_nowait, 1)
queue_get_task = asyncio.create_task(queue_get()) queue_get_task = asyncio.create_task(queue_get())
await started.wait() await started.wait()
self.assertFalse(finished) self.assertFalse(finished)
loop.call_later(0.01, q.put_nowait, 1)
res = await queue_get_task res = await queue_get_task
self.assertTrue(finished) self.assertTrue(finished)
self.assertEqual(1, res) self.assertEqual(1, res)
@ -167,17 +168,6 @@ class QueueGetTests(unittest.IsolatedAsyncioTestCase):
q = asyncio.Queue() q = asyncio.Queue()
self.assertRaises(asyncio.QueueEmpty, q.get_nowait) self.assertRaises(asyncio.QueueEmpty, q.get_nowait)
async def test_get_cancelled(self):
q = asyncio.Queue()
async def queue_get():
return await asyncio.wait_for(q.get(), 0.051)
get_task = asyncio.create_task(queue_get())
await asyncio.sleep(0.01) # let the task start
q.put_nowait(1)
self.assertEqual(1, await get_task)
async def test_get_cancelled_race(self): async def test_get_cancelled_race(self):
q = asyncio.Queue() q = asyncio.Queue()
@ -263,7 +253,7 @@ class QueuePutTests(unittest.IsolatedAsyncioTestCase):
reader = asyncio.create_task(q.get()) reader = asyncio.create_task(q.get())
await asyncio.sleep(0.01) await asyncio.sleep(0)
q.put_nowait(1) q.put_nowait(1)
q.put_nowait(2) q.put_nowait(2)
@ -288,7 +278,7 @@ class QueuePutTests(unittest.IsolatedAsyncioTestCase):
reader2 = tg.create_task(q.get()) reader2 = tg.create_task(q.get())
reader3 = tg.create_task(q.get()) reader3 = tg.create_task(q.get())
await asyncio.sleep(0.01) await asyncio.sleep(0)
q.put_nowait(1) q.put_nowait(1)
q.put_nowait(2) q.put_nowait(2)
@ -309,7 +299,7 @@ class QueuePutTests(unittest.IsolatedAsyncioTestCase):
# putting a second item in the queue has to block (qsize=1) # putting a second item in the queue has to block (qsize=1)
writer = asyncio.create_task(q.put(2)) writer = asyncio.create_task(q.put(2))
await asyncio.sleep(0.01) await asyncio.sleep(0)
value1 = q.get_nowait() value1 = q.get_nowait()
self.assertEqual(value1, 1) self.assertEqual(value1, 1)
@ -410,7 +400,7 @@ class QueuePutTests(unittest.IsolatedAsyncioTestCase):
# Task waiting for space to put an item in the queue. # Task waiting for space to put an item in the queue.
put_task = asyncio.create_task(queue.put(1)) put_task = asyncio.create_task(queue.put(1))
await asyncio.sleep(0.01) await asyncio.sleep(0)
# Check that the putter is correctly removed from queue._putters when # Check that the putter is correctly removed from queue._putters when
# the task is canceled. # the task is canceled.
@ -427,7 +417,7 @@ class QueuePutTests(unittest.IsolatedAsyncioTestCase):
# Task waiting for space to put a item in the queue. # Task waiting for space to put a item in the queue.
put_task = asyncio.create_task(queue.put(1)) put_task = asyncio.create_task(queue.put(1))
await asyncio.sleep(0.01) await asyncio.sleep(0)
# get_nowait() remove the future of put_task from queue._putters. # get_nowait() remove the future of put_task from queue._putters.
queue.get_nowait() queue.get_nowait()