openstack/oslo.messaging
Code Issues Proposed changes

Merge "[AMQP 1.0] Properly shut down test RPC server"

Browse Source
This commit is contained in:
Jenkins 2017-05-16 15:09:10 +00:00 committed by Gerrit Code Review
commit b53667675a
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
oslo_messaging/tests/drivers/test_amqp_driver.py
View File

@ -1420,16 +1420,24 @@ class TestMessageRetransmit(_AmqpBrokerTestCase):
None,
None)._poll_style_listener,
1)
rc = driver.send(target, {"context": "whatever"},
{"method": "echo", "id": "blah"},
wait_for_reply=True,
retry=2) # initial send + up to 2 resends
self.assertIsNotNone(rc)
self.assertEqual(0, self._nack_count)
self.assertEqual(rc.get('correlation-id'), 'blah')
listener.join(timeout=30)
self.assertFalse(listener.isAlive())
driver.cleanup()
try:
rc = driver.send(target, {"context": "whatever"},
{"method": "echo", "id": "blah"},
wait_for_reply=True,
retry=2) # initial send + up to 2 resends
except Exception:
# Some test runs are expected to raise an exception,
# clean up the listener since no message was received
listener.kill(timeout=30)
raise
else:
self.assertIsNotNone(rc)
self.assertEqual(0, self._nack_count)
self.assertEqual(rc.get('correlation-id'), 'blah')
listener.join(timeout=30)
finally:
self.assertFalse(listener.isAlive())
driver.cleanup()
def test_released(self):
# should retry and succeed