Improve tests even more

EpicWink · EpicWink · commit 420a2475ec8b · 2024-03-26T19:30:43.000+10:00
* Add missing 'qsize' check
* Test unblocked put on shutdown
* Await 'join_task' near task-done check
diff --git a/Lib/test/test_asyncio/test_queues.py b/Lib/test/test_asyncio/test_queues.py
@@ -527,8 +527,14 @@ class _QueueShutdownTestMixin:
 
     @staticmethod
     async def _ping_awaitable(a):
+        async def swallow(a_):
+            try:
+                return await a_
+            except Exception:
+                pass
+
         try:
-            await asyncio.wait_for(asyncio.shield(a), 0.01)
+            await asyncio.wait_for(asyncio.shield(swallow(a)), 0.01)
         except TimeoutError:
             pass
 
@@ -550,6 +556,7 @@ async def test_shutdown_empty(self):
 
         await self._ping_awaitable(join_task)
         self.assertTrue(join_task.done())
+        await join_task
 
         with self.assertRaisesShutdown():
             await q.put("data")
@@ -561,17 +568,26 @@ async def test_shutdown_empty(self):
         with self.assertRaisesShutdown():
             q.get_nowait()
 
-        await join_task
-
     async def test_shutdown_nonempty(self):
-        q = self.q_class()
+        q = self.q_class(maxsize=1)
         loop = asyncio.get_running_loop()
+
         q.put_nowait("data")
         join_task = loop.create_task(q.join())
+        put_task = loop.create_task(q.put("data2"))
+
+        await self._ping_awaitable(put_task)
+        self.assertFalse(put_task.done())
+
         q.shutdown(immediate=False)  # unfinished tasks: 1 -> 1
 
         self.assertEqual(q.qsize(), 1)
 
+        await self._ping_awaitable(put_task)
+        self.assertTrue(put_task.done())
+        with self.assertRaisesShutdown():
+            await put_task
+
         self.assertEqual(await q.get(), "data")
 
         await self._ping_awaitable(join_task)
@@ -604,6 +620,7 @@ async def test_shutdown_immediate(self):
 
         await self._ping_awaitable(join_task)
         self.assertTrue(join_task.done())
+        await join_task
 
         with self.assertRaisesShutdown():
             await q.put("data")
@@ -620,8 +637,6 @@ async def test_shutdown_immediate(self):
         ):
             q.task_done()
 
-        await join_task
-
     async def test_shutdown_immediate_with_unfinished(self):
         q = self.q_class()
         loop = asyncio.get_running_loop()
@@ -631,6 +646,8 @@ async def test_shutdown_immediate_with_unfinished(self):
         self.assertEqual(await q.get(), "data")
         q.shutdown(immediate=True)  # unfinished tasks: 2 -> 1
 
+        self.assertEqual(q.qsize(), 0)
+
         await self._ping_awaitable(join_task)
         self.assertFalse(join_task.done())
 
