summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhe Rivero <ghe.rivero@hp.com>2015-06-09 13:00:16 +0200
committerGhe Rivero <ghe.rivero@hp.com>2015-06-09 13:00:16 +0200
commitde84b798f9eaac831621a63198ce2366effaeabd (patch)
tree07c5155129217bc3db3accbb26cdaf5683e8520a
parent6d7ca50813fb46dcb836715235f7cb412e25dcdc (diff)
downloados-client-config-de84b798f9eaac831621a63198ce2366effaeabd.tar.gz
Add test to check cert and key as a tuple
When the cert file doesn't include a key within it, a tuple with the cert and key needs to be passed to the requests library. Change-Id: I17534b8e7d07b3ad102cc6a6a839541c83281b8e
-rw-r--r--os_client_config/tests/test_cloud_config.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/os_client_config/tests/test_cloud_config.py b/os_client_config/tests/test_cloud_config.py
index 729bc99..5f964db 100644
--- a/os_client_config/tests/test_cloud_config.py
+++ b/os_client_config/tests/test_cloud_config.py
@@ -67,12 +67,12 @@ class TestCloudConfig(base.TestCase):
config_dict['verify'] = False
cc = cloud_config.CloudConfig("test1", "region-xx", config_dict)
- (verify, cacert) = cc.get_requests_verify_args()
+ (verify, cert) = cc.get_requests_verify_args()
self.assertFalse(verify)
config_dict['verify'] = True
cc = cloud_config.CloudConfig("test1", "region-xx", config_dict)
- (verify, cacert) = cc.get_requests_verify_args()
+ (verify, cert) = cc.get_requests_verify_args()
self.assertTrue(verify)
def test_verify_cacert(self):
@@ -81,10 +81,22 @@ class TestCloudConfig(base.TestCase):
config_dict['verify'] = False
cc = cloud_config.CloudConfig("test1", "region-xx", config_dict)
- (verify, cacert) = cc.get_requests_verify_args()
+ (verify, cert) = cc.get_requests_verify_args()
self.assertFalse(verify)
config_dict['verify'] = True
cc = cloud_config.CloudConfig("test1", "region-xx", config_dict)
- (verify, cacert) = cc.get_requests_verify_args()
+ (verify, cert) = cc.get_requests_verify_args()
self.assertEqual("certfile", verify)
+
+ def test_cert_with_key(self):
+ config_dict = copy.deepcopy(fake_config_dict)
+ config_dict['cacert'] = None
+ config_dict['verify'] = False
+
+ config_dict['cert'] = 'cert'
+ config_dict['key'] = 'key'
+
+ cc = cloud_config.CloudConfig("test1", "region-xx", config_dict)
+ (verify, cert) = cc.get_requests_verify_args()
+ self.assertEqual(("cert", "key"), cert)