openstack/oslo.messaging
Code Issues Proposed changes

Merge "Set correct group for matchmaker_redis options"

Browse Source
This commit is contained in:
Jenkins 2014-06-20 20:08:34 +00:00 committed by Gerrit Code Review
commit e0730983ee
2 changed files with 3 additions and 2 deletions
oslo/messaging
opts.py
tests
test_opts.py

2
oslo/messaging/opts.py

@ -38,7 +38,6 @@ _global_opt_lists = [
impl_rabbit.rabbit_opts,
impl_zmq.zmq_opts,
matchmaker.matchmaker_opts,
matchmaker_redis.matchmaker_redis_opts,
impl_eventlet._eventlet_opts,
notifier._notifier_opts,
client._client_opts,
@ -47,6 +46,7 @@ _global_opt_lists = [
_opts = [
(None, list(itertools.chain(*_global_opt_lists))),
('matchmaker_redis', matchmaker_redis.matchmaker_redis_opts),
('matchmaker_ring', matchmaker_ring.matchmaker_opts),
]

3
tests/test_opts.py

@ -22,11 +22,12 @@ from tests import utils as test_utils
class OptsTestCase(test_utils.BaseTestCase):
def _test_list_opts(self, result):
self.assertEqual(2, len(result))
self.assertEqual(3, len(result))
groups = [g for (g, l) in result]
self.assertIn(None, groups)
self.assertIn('matchmaker_ring', groups)
self.assertIn('matchmaker_redis', groups)
opt_names = [o.name for (g, l) in result for o in l]
self.assertIn('rpc_backend', opt_names)