diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-04 05:30:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-04 05:30:18 +0000 |
| commit | aa9c01dcdf33f1b81037b2f2a7b3381d15892675 (patch) | |
| tree | 2e8a6b5ed23ec1f3b3e39a081da8afc99f5b954b /oslo_config | |
| parent | caec8b53c485baf12ddfcf615bf3ef74a4f9fde2 (diff) | |
| parent | dd6418d991d8a08a9844117cbef059ba5ef3ae26 (diff) | |
| download | oslo-config-aa9c01dcdf33f1b81037b2f2a7b3381d15892675.tar.gz | |
Merge "Added exception when namespace option is missing"
Diffstat (limited to 'oslo_config')
| -rw-r--r-- | oslo_config/generator.py | 8 | ||||
| -rw-r--r-- | oslo_config/tests/test_generator.py | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/oslo_config/generator.py b/oslo_config/generator.py index a081d1b..4964ca9 100644 --- a/oslo_config/generator.py +++ b/oslo_config/generator.py @@ -748,7 +748,13 @@ def main(args=None): logging.basicConfig(level=logging.WARN) conf = cfg.ConfigOpts() register_cli_opts(conf) - conf(args, version=version) + try: + conf(args, version=version) + except cfg.RequiredOptError: + conf.print_help() + if not sys.argv[1:]: + raise SystemExit + raise generate(conf) diff --git a/oslo_config/tests/test_generator.py b/oslo_config/tests/test_generator.py index 015521e..4c92eb5 100644 --- a/oslo_config/tests/test_generator.py +++ b/oslo_config/tests/test_generator.py @@ -1581,10 +1581,10 @@ class GeneratorRaiseErrorTestCase(base.BaseTestCase): with mock.patch('pkg_resources.iter_entry_points', fake_eps): self.assertRaises(FakeException, generator.generate, self.conf) - def test_generator_call_with_no_arguments_raises_error(self): + def test_generator_call_with_no_arguments_raises_system_exit(self): testargs = ['oslo-config-generator'] with mock.patch('sys.argv', testargs): - self.assertRaises(cfg.RequiredOptError, generator.main, []) + self.assertRaises(SystemExit, generator.main, []) class ChangeDefaultsTestCase(base.BaseTestCase): |