Merge "Added exception when namespace option is missing"
This commit is contained in:
commit
aa9c01dcdf
|
@ -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)
|
||||
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue