openstack/deb-python-oslo.messaging
Code Issues Proposed changes

Set correct group for matchmaker_redis options

Browse Source 
Before the change, config generator put those options into DEFAULT
section.

Change-Id: I1e8e746cde4627ddf79632ce8255e268de8bd3c3
Closes-Bug: 1332588
This commit is contained in:
Ihar Hrachyshka
2014-06-20 17:35:30 +02:00
parent 023e5e43f6
commit 38c1f26102
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oslo/messaging/opts.py
View File

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

3
tests/test_opts.py
View File

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