openstack/python-glanceclient
Code Issues Proposed changes

Fix v2 so that you can see the default help info

Browse Source 
you can see the default help informatiion is v2
subcommand information if input glance command

Co-Authored-By: Stuart McLaren <stuart.mclaren@hp.com>

Closes-bug: #1563649
Change-Id: I7d227f3e68aa555b2e25848618f76df4872af35d
This commit is contained in:
zwei 2016-03-17 18:35:08 +08:00 committed by Stuart McLaren
parent 22a03fd475
commit 444ffbeaa9
2 changed files with 9 additions and 3 deletions
glanceclient
shell.py
tests/unit
test_shell.py

1
glanceclient/shell.py

@ -535,6 +535,7 @@ class OpenStackImagesShell(object):
# Handle top-level --help/-h before attempting to parse # Handle top-level --help/-h before attempting to parse
# a command off the command line # a command off the command line
if options.help or not argv: if options.help or not argv:
parser = _get_subparser(api_version)
self.do_help(options, parser=parser) self.do_help(options, parser=parser)
return 0 return 0

9
glanceclient/tests/unit/test_shell.py

@ -523,8 +523,13 @@ class ShellTest(testutils.TestCase):
except SystemExit: except SystemExit:
self.fail('Unexpected SystemExit') self.fail('Unexpected SystemExit')
# We expect the normal usage as a result # We expect the normal v2 usage as a result
self.assertIn('Command-line interface to the OpenStack Images API', expected = ['Command-line interface to the OpenStack Images API',
'image-list',
'image-deactivate',
'location-add']
for output in expected:
self.assertIn(output,
sys.stdout.getvalue()) sys.stdout.getvalue())