openstack/python-openstackclient
Code Issues Proposed changes

Merge "Add cli tests for --verify and friends"

Browse Source
This commit is contained in:
Jenkins 2015-05-29 21:03:03 +00:00 committed by Gerrit Code Review
commit d9b7d13edf
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/shell.py
View File

@ -187,14 +187,14 @@ class OpenStackShell(app.App):
verify_group = parser.add_mutually_exclusive_group()
verify_group.add_argument(
'--verify',
action='store_true',
default=None,
action='store_false',
help='Verify server certificate (default)',
)
verify_group.add_argument(
'--insecure',
default=None,
action='store_true',
default=None,
help='Disable server certificate verification',
)
parser.add_argument(

54
openstackclient/tests/test_shell.py
View File

@ -527,13 +527,65 @@ class TestShellCli(TestShell):
super(TestShellCli, self).tearDown()
os.environ = self.orig_env
def test_shell_args(self):
def test_shell_args_no_options(self):
_shell = make_shell()
with mock.patch("openstackclient.shell.OpenStackShell.initialize_app",
self.app):
fake_execute(_shell, "list user")
self.app.assert_called_with(["list", "user"])
def test_shell_args_ca_options(self):
_shell = make_shell()
# NOTE(dtroyer): The commented out asserts below are the desired
# behaviour and will be uncommented when the
# handling for --verify and --insecure is fixed.
# Default
fake_execute(_shell, "list user")
self.assertIsNone(_shell.options.verify)
self.assertIsNone(_shell.options.insecure)
self.assertEqual('', _shell.options.os_cacert)
self.assertTrue(_shell.verify)
# --verify
fake_execute(_shell, "--verify list user")
self.assertTrue(_shell.options.verify)
self.assertIsNone(_shell.options.insecure)
self.assertEqual('', _shell.options.os_cacert)
self.assertTrue(_shell.verify)
# --insecure
fake_execute(_shell, "--insecure list user")
self.assertIsNone(_shell.options.verify)
self.assertTrue(_shell.options.insecure)
self.assertEqual('', _shell.options.os_cacert)
self.assertFalse(_shell.verify)
# --os-cacert
fake_execute(_shell, "--os-cacert foo list user")
self.assertIsNone(_shell.options.verify)
self.assertIsNone(_shell.options.insecure)
self.assertEqual('foo', _shell.options.os_cacert)
self.assertTrue(_shell.verify)
# --os-cacert and --verify
fake_execute(_shell, "--os-cacert foo --verify list user")
self.assertTrue(_shell.options.verify)
self.assertIsNone(_shell.options.insecure)
self.assertEqual('foo', _shell.options.os_cacert)
self.assertTrue(_shell.verify)
# --os-cacert and --insecure
# NOTE(dtroyer): This really is a bogus combination, the default is
# to follow the requests.Session convention and let
# --os-cacert override --insecure
fake_execute(_shell, "--os-cacert foo --insecure list user")
self.assertIsNone(_shell.options.verify)
self.assertTrue(_shell.options.insecure)
self.assertEqual('foo', _shell.options.os_cacert)
self.assertTrue(_shell.verify)
def test_default_env(self):
flag = ""
kwargs = {