openstack
/
oslo.config
Code Issues Proposed changes

Merge "Fix get_location for opts in groups"

This commit is contained in:
Zuul 2019-01-14 16:53:49 +00:00 committed by Gerrit Code Review
parent 3e4fc82843 03f91cfd67
commit b7723c30ad
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oslo_config/cfg.py
View File

@ -3095,7 +3095,8 @@ class ConfigOpts(collections.Mapping):
.. versionadded:: 5.3.0
"""
value, loc = self._do_get(name, group, None)
opt_group = OptGroup(group) if group is not None else None
value, loc = self._do_get(name, opt_group, None)
return loc
class GroupAttr(collections.Mapping):

14
oslo_config/tests/test_get_location.py
View File

@ -68,6 +68,11 @@ class GetLocationTestCase(base.BaseTestCase):
default='cli_opt_default',
)
self.conf.register_cli_opt(self.cli_opt)
self.group_opt = cfg.StrOpt(
'group_opt',
default='group_opt_default',
)
self.conf.register_opt(self.group_opt, group='group')
def test_opt_default(self):
self.conf([])
@ -189,3 +194,12 @@ class GetLocationTestCase(base.BaseTestCase):
# We expect register_opt() to return False to indicate that
# the option was already registered.
self.assertFalse(self.conf.register_opt(dupe_opt))
def test_group_opt(self):
self.conf([])
loc = self.conf.get_location('group_opt', 'group')
self.assertEqual(
cfg.Locations.opt_default,
loc.location,
)
self.assertIn('test_get_location.py', loc.detail)