summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAanand Prasad <aanand.prasad@gmail.com>2016-02-23 14:29:52 -0800
committerAanand Prasad <aanand.prasad@gmail.com>2016-02-23 14:29:52 -0800
commit9ba0ddf267f853afe37441da7798987e199817dd (patch)
tree296dd796ef8f52b2381524c07b91007105f919a9 /tests
parentcc450d697ce326eaa1f5b3fa66984005a5f4c613 (diff)
downloaddocker-py-9ba0ddf267f853afe37441da7798987e199817dd.tar.gz
Fix TLS regressions
- Set `verify` to the CA cert path if one has been specified, rather than `True` - Don't set `assert_fingerprint` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/utils_test.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py
index a0a96bb..87796d1 100644
--- a/tests/unit/utils_test.py
+++ b/tests/unit/utils_test.py
@@ -194,7 +194,7 @@ class KwargsFromEnvTest(base.BaseTestCase):
try:
client = Client(**kwargs)
self.assertEqual(kwargs['base_url'], client.base_url)
- self.assertEqual(kwargs['tls'].verify, client.verify)
+ self.assertEqual(kwargs['tls'].ca_cert, client.verify)
self.assertEqual(kwargs['tls'].cert, client.cert)
except TypeError as e:
self.fail(e)
@@ -213,7 +213,6 @@ class KwargsFromEnvTest(base.BaseTestCase):
try:
client = Client(**kwargs)
self.assertEqual(kwargs['base_url'], client.base_url)
- self.assertEqual(kwargs['tls'].ca_cert, client.ca_cert)
self.assertEqual(kwargs['tls'].cert, client.cert)
self.assertFalse(kwargs['tls'].verify)
except TypeError as e:
@@ -238,7 +237,6 @@ class KwargsFromEnvTest(base.BaseTestCase):
try:
client = Client(**kwargs)
self.assertEqual(kwargs['base_url'], client.base_url)
- self.assertEqual(kwargs['tls'].ca_cert, client.ca_cert)
self.assertEqual(kwargs['tls'].cert, client.cert)
self.assertFalse(kwargs['tls'].verify)
except TypeError as e: