diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-04 19:27:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-04 19:27:36 +0000 |
| commit | 7e067c6f4f2dddfd9ea4b4a3df90959a7d8f2f0f (patch) | |
| tree | 7048c1294537d9382bea4179808795a11ec6ec6f /openstackclient/tests/test_shell.py | |
| parent | 0c5f12aec063c689d859027c2944e1cc3497a1ff (diff) | |
| parent | 31d785ec6951a84f831ea3dfd49214c42ae4fd26 (diff) | |
| download | python-openstackclient-7e067c6f4f2dddfd9ea4b4a3df90959a7d8f2f0f.tar.gz | |
Merge "Allow --insecure to override --os-cacert"
Diffstat (limited to 'openstackclient/tests/test_shell.py')
| -rw-r--r-- | openstackclient/tests/test_shell.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openstackclient/tests/test_shell.py b/openstackclient/tests/test_shell.py index 8850d8f9..b080ae91 100644 --- a/openstackclient/tests/test_shell.py +++ b/openstackclient/tests/test_shell.py @@ -540,14 +540,15 @@ class TestShellCli(TestShell): 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 + # NOTE(dtroyer): Per bug https://bugs.launchpad.net/bugs/1447784 + # in this combination --insecure now overrides any + # --os-cacert setting, where before --insecure + # was ignored if --os-cacert was set. fake_execute(_shell, "--os-cacert foo --insecure list user") self.assertIsNone(_shell.options.verify) self.assertTrue(_shell.options.insecure) self.assertEqual('foo', _shell.options.cacert) - self.assertTrue(_shell.verify) + self.assertFalse(_shell.verify) def test_default_env(self): flag = "" |