chore: update test case

nutes-uepb · Oct 2, 2024 · c37a152 · c37a152
1 parent 48ca475
commit c37a152
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/amqp_client_python/rabbitmq/async_channel.py b/amqp_client_python/rabbitmq/async_channel.py
@@ -473,7 +473,7 @@ async def rpc_subscribe(
 
         self.queue_bind(queue_name, exchange_name, routing_key)
         if not self.consumers[queue_name]:
-            registered: Future[bool] = Future(loop=self.ioloop)
+            registered: Future[bool] = self.ioloop.create_future()
             self.consumers[queue_name] = True
             func = partial(self.on_message, queue_name)
             self._channel.basic_consume(

diff --git a/tests/unit/channels/test_rpc_subscribe.py b/tests/unit/channels/test_rpc_subscribe.py
@@ -19,11 +19,12 @@ async def test_async_channel_subscribe(
 
     future_publisher = Future(loop=loop)
     future_publisher.set_result(True)
-    connection_mock.ioloop.create_future.side_effect = [
-        future_publisher,
-    ]
+    connection_mock.ioloop.call_later = loop.call_later
+    connection_mock.ioloop.create_future.return_value = future_publisher
     channel_factory_mock.create_channel.return_value = channel_mock
-    channel = AsyncChannel(channel_factory=channel_factory_mock, channel_type=ConnectionType.RPC_SERVER)
+    channel = AsyncChannel(
+        channel_factory=channel_factory_mock, channel_type=ConnectionType.RPC_SERVER
+    )
     channel.open(connection_mock)
 
     async def handle(*body):
@@ -34,7 +35,7 @@ async def handle(*body):
     )
     assert channel._channel == channel_mock
     assert iscoroutine(rpc_subscribe)
-    assert await rpc_subscribe is None
+    assert (await rpc_subscribe) is None
     channel_mock.basic_consume.assert_called_once()
     assert channel_mock.basic_consume.call_args.args == (queue_name,)
 
@@ -54,9 +55,7 @@ async def test_rpc_subscribe_publisher_started(
     future_publisher = Future(loop=loop)
     if consumer:
         future_publisher.set_result(True)
-    connection_mock.ioloop.create_future.side_effect = [
-        future_publisher,
-    ]
+    connection_mock.ioloop.create_future.return_value = future_publisher
     connection_mock.ioloop.call_later = loop.call_later
     channel_factory_mock.create_channel.return_value = channel_mock
     channel = AsyncChannel(channel_factory=channel_factory_mock)
@@ -66,10 +65,10 @@ async def handle(*body):
         return b"result"
 
     rpc_subscribe = channel.rpc_subscribe(
-        exchange, routing_key, queue_name, handle, content_type, connection_mock.ioloop
+        exchange, routing_key, queue_name, handle, content_type
     )
     if consumer:
-        assert await rpc_subscribe is None
+        assert (await rpc_subscribe) is None
         assert channel.rpc_publisher_starting is True
     else:
         with pytest.raises(EventBusException):