openstack/oslo.messaging
Code Issues Proposed changes

Merge "Don't include msg_id or reply_q in casts"

Browse Source
This commit is contained in:
Jenkins 2013-08-26 13:16:42 +00:00 committed by Gerrit Code Review
commit 5c2c32010c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oslo/messaging/_drivers/amqpdriver.py
View File

@ -346,14 +346,15 @@ class AMQPDriverBase(base.BaseDriver):
context = Context(ctxt) context = Context(ctxt)
msg = message msg = message
if wait_for_reply:
msg_id = uuid.uuid4().hex msg_id = uuid.uuid4().hex
msg.update({'_msg_id': msg_id}) msg.update({'_msg_id': msg_id})
LOG.debug('MSG_ID is %s' % (msg_id)) LOG.debug('MSG_ID is %s' % (msg_id))
msg.update({'_reply_q': self._get_reply_q()})
rpc_amqp._add_unique_id(msg) rpc_amqp._add_unique_id(msg)
rpc_amqp.pack_context(msg, context) rpc_amqp.pack_context(msg, context)
msg.update({'_reply_q': self._get_reply_q()})
if envelope: if envelope:
msg = rpc_common.serialize_msg(msg) msg = rpc_common.serialize_msg(msg)

7
tests/test_rabbit.py
View File

@ -98,7 +98,7 @@ class TestRabbitTransportURL(test_utils.BaseTestCase):
target = messaging.Target(topic='testtopic') target = messaging.Target(topic='testtopic')
driver.send(target, {}, {}) driver.listen(target)
self.assertEquals(passed_params[0], self.expected) self.assertEquals(passed_params[0], self.expected)
@ -449,10 +449,9 @@ class TestRequestWireFormat(test_utils.BaseTestCase):
received = msgs[0] received = msgs[0]
received['oslo.message'] = jsonutils.loads(received['oslo.message']) received['oslo.message'] = jsonutils.loads(received['oslo.message'])
# FIXME(markmc): add _msg_id and _reply_q check
expected_msg = { expected_msg = {
'_msg_id': self.uuids[0].hex, '_unique_id': self.uuids[0].hex,
'_unique_id': self.uuids[1].hex,
'_reply_q': 'reply_' + self.uuids[2].hex,
} }
expected_msg.update(self.expected) expected_msg.update(self.expected)
expected_msg.update(self.expected_ctxt) expected_msg.update(self.expected_ctxt)