openstack
/
oslo.messaging
Code Issues Proposed changes

Merge "list_opts: update the notification options group"

This commit is contained in:
Jenkins 2016-01-08 17:23:40 +00:00 committed by Gerrit Code Review
parent 6e95e8b891 87e06d97be
commit c4e9830a2d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_messaging/opts.py
View File

@ -36,7 +36,6 @@ _global_opt_lists = [
impl_zmq.zmq_opts,
matchmaker_redis.matchmaker_redis_opts,
impl_pooledexecutor._pool_opts,
notifier._notifier_opts,
client._client_opts,
transport._transport_opts,
]
@ -45,6 +44,7 @@ _opts = [
(None, list(itertools.chain(*_global_opt_lists))),
('matchmaker_redis', matchmaker_redis.matchmaker_redis_opts),
('oslo_messaging_amqp', amqp_opts.amqp1_opts),
('oslo_messaging_notifications', notifier._notifier_opts),
('oslo_messaging_rabbit', list(itertools.chain(amqp.amqp_opts,
impl_rabbit.rabbit_opts))),
]

3
oslo_messaging/tests/test_opts.py
View File

@ -32,12 +32,13 @@ class OptsTestCase(test_utils.BaseTestCase):
super(OptsTestCase, self).setUp()
def _test_list_opts(self, result):
self.assertEqual(4, len(result))
self.assertEqual(5, len(result))
groups = [g for (g, l) in result]
self.assertIn(None, groups)
self.assertIn('matchmaker_redis', groups)
self.assertIn('oslo_messaging_amqp', groups)
self.assertIn('oslo_messaging_notifications', groups)
self.assertIn('oslo_messaging_rabbit', groups)
opt_names = [o.name for (g, l) in result for o in l]