summaryrefslogtreecommitdiff
path: root/openstackclient/tests/test_shell.py
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/tests/test_shell.py')
-rw-r--r--openstackclient/tests/test_shell.py9
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 = ""