openstack/python-glanceclient
Code Issues Proposed changes

Merge "print usage when no argument is specified for python3"

Browse Source
This commit is contained in:
Jenkins
2015-10-14 11:04:16 +00:00
committed by Gerrit Code Review
parent 8687b05ea0 a8a7c68990
commit b88b510d3b
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glanceclient/shell.py
View File

@@ -759,7 +759,8 @@ class HelpFormatter(argparse.HelpFormatter):
def main(): def main():
try: try:
OpenStackImagesShell().main(map(encodeutils.safe_decode, sys.argv[1:])) argv = [encodeutils.safe_decode(a) for a in sys.argv[1:]]
OpenStackImagesShell().main(argv)
except KeyboardInterrupt: except KeyboardInterrupt:
utils.exit('... terminating glance client', exit_code=130) utils.exit('... terminating glance client', exit_code=130)
except Exception as e: except Exception as e:

14
glanceclient/tests/unit/test_shell.py
View File

@@ -523,6 +523,20 @@ class ShellTest(testutils.TestCase):
glance_shell = openstack_shell.OpenStackImagesShell() glance_shell = openstack_shell.OpenStackImagesShell()
self.assertRaises(exc.CommandError, glance_shell.main, args.split()) self.assertRaises(exc.CommandError, glance_shell.main, args.split())
@mock.patch('sys.argv', ['glance'])
@mock.patch('sys.stdout', six.StringIO())
@mock.patch('sys.stderr', six.StringIO())
def test_main_noargs(self):
# Ensure that main works with no command-line arguments
try:
openstack_shell.main()
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())
class ShellTestWithKeystoneV3Auth(ShellTest): class ShellTestWithKeystoneV3Auth(ShellTest):
# auth environment to use # auth environment to use