diff options
Diffstat (limited to 'glanceclient')
| -rwxr-xr-x | glanceclient/shell.py | 1 | ||||
| -rw-r--r-- | glanceclient/tests/unit/test_shell.py | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/glanceclient/shell.py b/glanceclient/shell.py index 86e6107..10b22de 100755 --- a/glanceclient/shell.py +++ b/glanceclient/shell.py @@ -535,6 +535,7 @@ class OpenStackImagesShell(object): # Handle top-level --help/-h before attempting to parse # a command off the command line if options.help or not argv: + parser = _get_subparser(api_version) self.do_help(options, parser=parser) return 0 diff --git a/glanceclient/tests/unit/test_shell.py b/glanceclient/tests/unit/test_shell.py index 2a33dc0..fb2ca9b 100644 --- a/glanceclient/tests/unit/test_shell.py +++ b/glanceclient/tests/unit/test_shell.py @@ -523,9 +523,14 @@ class ShellTest(testutils.TestCase): except SystemExit: self.fail('Unexpected SystemExit') - # We expect the normal usage as a result - self.assertIn('Command-line interface to the OpenStack Images API', - sys.stdout.getvalue()) + # We expect the normal v2 usage as a result + 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()) class ShellTestWithKeystoneV3Auth(ShellTest): |