From f93d720abd90e8addfdcb299cd22cbd4645c2c4e Mon Sep 17 00:00:00 2001
From: Wei Chen <182598863+cw-jlu@users.noreply.github.com>
Date: Thu, 12 Nov 2026 21:12:42 +0800
Subject: [PATCH] Await merged listener cleanup before returning from close

---
 taskiq_aio_pika/broker.py | 20 ++++++----
 tests/test_listener.py    | 84 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 8 deletions(-)
 create mode 100644 tests/test_listener.py

diff --git a/taskiq_aio_pika/broker.py b/taskiq_aio_pika/broker.py
index fd98992..c6fdc15 100644
--- a/taskiq_aio_pika/broker.py
+++ b/taskiq_aio_pika/broker.py
@@ -1,5 +1,6 @@
 import asyncio
 from collections.abc import AsyncGenerator, Callable
+from contextlib import aclosing
 from datetime import timedelta
 from functools import partial
 from logging import getLogger
@@ -498,14 +499,17 @@ async def body(
                 # Suppress errors during iterator cleanup if channel is being closed
                 logger.info("Queue iterator closed during shutdown")
 
-        async for message in merge_async_iterables(
-            *[
-                body(queue, consumer_args)
-                for queue, consumer_args in queue_with_consumer_args_list
-                if not self._delay_queue or queue.name != self._delay_queue.name
-            ],
-        ):
-            yield message
+        async with aclosing(
+            merge_async_iterables(
+                *[
+                    body(queue, consumer_args)
+                    for queue, consumer_args in queue_with_consumer_args_list
+                    if not self._delay_queue or queue.name != self._delay_queue.name
+                ],
+            ),
+        ) as messages:
+            async for message in messages:
+                yield message
 
     async def shutdown(self) -> None:
         """Close all connections on shutdown."""
diff --git a/tests/test_listener.py b/tests/test_listener.py
new file mode 100644
index 0000000..f241f85
--- /dev/null
+++ b/tests/test_listener.py
@@ -0,0 +1,84 @@
+import asyncio
+from contextlib import aclosing
+
+import pytest
+from aio_pika import Channel, Message
+
+from taskiq_aio_pika import AioPikaBroker, Queue, QueueType
+from taskiq_aio_pika.exchange import Exchange
+from tests.conftest import _cleanup_amqp_resources
+
+
+@pytest.mark.parametrize("queue_count", [1, 2])
+@pytest.mark.parametrize("stop", ["close", "throw", "cancel"])
+async def test_listener_waits_for_consumer_cleanup(
+    amqp_url: str,
+    test_channel: Channel,
+    queue_name: str,
+    dead_queue_name: str,
+    exchange_name: str,
+    queue_count: int,
+    stop: str,
+) -> None:
+    queue_names = [f"{queue_name}_{index}" for index in range(queue_count)]
+    broker = AioPikaBroker(
+        url=amqp_url,
+        exchange=Exchange(name=exchange_name),
+        dead_letter_queue=Queue(name=dead_queue_name, type=QueueType.CLASSIC),
+        task_queues=[Queue(name=name, type=QueueType.CLASSIC) for name in queue_names],
+    )
+    broker.is_worker_process = True
+    try:
+        await broker.startup()
+        queues = [await test_channel.get_queue(name) for name in queue_names]
+        async with aclosing(broker.listen()) as listener:
+            for queue in queues:
+                await test_channel.default_exchange.publish(
+                    Message(queue.name.encode()),
+                    routing_key=queue.name,
+                )
+            received = []
+            for _ in queues:
+                message = await asyncio.wait_for(anext(listener), timeout=3)
+                received.append(message.data)
+                await message.ack()
+            assert sorted(received) == sorted(name.encode() for name in queue_names)
+            for queue in queues:
+                assert (await queue.declare()).consumer_count == 1
+
+            if stop == "close":
+                await listener.aclose()
+            elif stop == "throw":
+                with pytest.raises(ValueError, match="consumer stopped"):
+                    await listener.athrow(ValueError("consumer stopped"))
+            else:
+                pending = asyncio.create_task(anext(listener))
+                await asyncio.sleep(0)
+                pending.cancel()
+                with pytest.raises(asyncio.CancelledError):
+                    await pending
+
+            # A real AMQP declare checks server state as soon as close returns.
+            for queue in queues:
+                assert (await queue.declare()).consumer_count == 0
+
+        # Closing one listener must leave the shared channel usable.
+        async with aclosing(broker.listen()) as listener:
+            for queue in queues:
+                await test_channel.default_exchange.publish(
+                    Message(b"next"),
+                    routing_key=queue.name,
+                )
+            for _ in queues:
+                message = await asyncio.wait_for(anext(listener), timeout=3)
+                assert message.data == b"next"
+                await message.ack()
+        for queue in queues:
+            assert (await queue.declare()).consumer_count == 0
+    finally:
+        await broker.shutdown()
+        await _cleanup_amqp_resources(
+            amqp_url,
+            [exchange_name],
+            [*queue_names, dead_queue_name],
+        )