Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sage_utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__title__ = 'sage-utils'
__version__ = '0.5.2'
__version__ = '0.5.3'
__license__ = 'BSD'
VERSION = __version__
5 changes: 3 additions & 2 deletions sage_utils/amqp/clients.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ class RpcAmqpClient(object):
}

def __init__(self, app, routing_key, request_exchange='',
response_queue=None, response_exchange=''):
response_queue=None, response_exchange='', loop=None):
self.app = app
self.loop = loop or getattr(self.app, 'loop', None) or asyncio.get_event_loop()
self.routing_key = routing_key
self.request_exchange = request_exchange
self.response_queue = response_queue
Expand Down Expand Up @@ -59,7 +60,7 @@ async def connect(self, consume_timeout=None):
queue_name=self._response_queue_name,
),
timeout=consume_timeout,
loop=self.app.loop
loop=self.loop
)

async def on_response(self, _channel, body, _envelope, _properties):
Expand Down
28 changes: 28 additions & 0 deletions tests/amqp/test_rpc_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,34 @@ async def test_rpc_amqp_client_returns_ok(event_loop):
await extension.deinit(event_loop)


@pytest.mark.asyncio
async def test_rpc_amqp_client_returns_ok_with_custom_event_loop(event_loop):
app = Application(config=FakeConfig(), loop=event_loop)
register_worker = FakeRegisterMicroserviceWorker(app)
extension = AmqpExtension(app)
extension.register_worker(register_worker)

await extension.init(event_loop)

client = RpcAmqpClient(
app=app,
routing_key=REQUEST_QUEUE,
request_exchange=REQUEST_EXCHANGE,
response_queue='',
response_exchange=RESPONSE_EXCHANGE_NAME,
loop=event_loop
)
response = await client.send(payload={'name': 'microservice', 'version': '1.0.0'})

assert Response.CONTENT_FIELD_NAME in response.keys()
assert response[Response.CONTENT_FIELD_NAME] == 'OK'

assert Response.EVENT_FIELD_NAME in response.keys()
assert response[Response.EVENT_FIELD_NAME] is None

await extension.deinit(event_loop)


@pytest.mark.asyncio
async def test_rpc_amqp_client_returns_an_error(event_loop):
app = Application(config=FakeConfig(), loop=event_loop)
Expand Down