openstack/oslo.messaging
Code Issues Proposed changes

Merge "AMQP 1.0: Properly initialize AMQP 1.0 configuration options"

Browse Source
This commit is contained in:
Jenkins 2015-10-08 13:57:21 +00:00 committed by Gerrit Code Review
commit 7eadea5bec
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oslo_messaging/conffixture.py
View File

@ -56,6 +56,9 @@ class ConfFixture(fixtures.Fixture):
_import_opts(self.conf,
'oslo_messaging._drivers.amqp', 'amqp_opts',
'oslo_messaging_qpid')
_import_opts(self.conf,
'oslo_messaging._drivers.protocols.amqp.opts',
'amqp1_opts', 'oslo_messaging_amqp')
_import_opts(self.conf,
'oslo_messaging._drivers.impl_zmq', 'zmq_opts')
_import_opts(self.conf,

7
oslo_messaging/tests/test_amqp_driver.py
View File

@ -395,6 +395,8 @@ mech_list: ${mechs}
sasl_config_dir=self._conf_dir,
sasl_config_name="openstack")
self._broker.start()
self.messaging_conf.transport_driver = 'amqp'
self.conf = self.messaging_conf.conf
def tearDown(self):
super(TestCyrusAuthentication, self).tearDown()
@ -460,8 +462,6 @@ mech_list: ${mechs}
wait_for_reply=True,
timeout=2.0)
driver.cleanup()
self.config(sasl_mechanisms=None,
group="oslo_messaging_amqp")
def test_authentication_default_username(self):
"""Verify that a configured username/password is used if none appears
@ -481,9 +481,6 @@ mech_list: ${mechs}
listener.join(timeout=30)
self.assertFalse(listener.isAlive())
driver.cleanup()
self.config(username=None,
password=None,
group="oslo_messaging_amqp")
@testtools.skipUnless(pyngus, "proton modules not present")