x/deb-oslo.messaging
Code Issues Proposed changes

Merge "Revert "Ensure the json result type is bytes on Python 3""

Browse Source
This commit is contained in:
Jenkins
2016-03-11 14:25:04 +00:00
committed by Gerrit Code Review
parent 5972b2310f bb4121a465
commit cc89fc3174
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_messaging/tests/drivers/test_impl_kafka.py
View File

@@ -145,7 +145,7 @@ class TestKafkaConnection(test_utils.BaseTestCase):
conn.consumer = mock.MagicMock()
conn.consumer.fetch_messages = mock.MagicMock(
return_value=iter([jsonutils.dump_as_bytes(fake_message)]))
return_value=iter([jsonutils.dumps(fake_message)]))
self.assertEqual(fake_message, jsonutils.loads(conn.consume()[0]))
self.assertEqual(1, len(conn.consumer.fetch_messages.mock_calls))

2
oslo_messaging/tests/drivers/test_impl_rabbit.py
View File

@@ -897,7 +897,7 @@ class TestReplyWireFormat(test_utils.BaseTestCase):
'_reply_q': 'reply_' + uuid.uuid4().hex,
})
msg['oslo.message'] = jsonutils.dump_as_bytes(msg['oslo.message'])
msg['oslo.message'] = jsonutils.dumps(msg['oslo.message'])
producer.publish(msg)