diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2016-03-15 10:37:29 -0700 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2016-03-15 10:37:29 -0700 |
| commit | 7befe694bd21e3c54bb1d7825270ea4bd6864c13 (patch) | |
| tree | c5ddb25ad50e372a32052533f93fe30bdf0a1f3c | |
| parent | fa7068cb7cf2ae1efcc2b3b99f24f4c7aa29e989 (diff) | |
| parent | 8e93abf27125cc10f78fc2f52280682b3fc7ad5e (diff) | |
| download | docker-py-7befe694bd21e3c54bb1d7825270ea4bd6864c13.tar.gz | |
Merge pull request #988 from docker/tls-fixes
Fix enable_tls issue
| -rw-r--r-- | docker/utils/utils.py | 8 | ||||
| -rw-r--r-- | tests/unit/utils_test.py | 14 |
2 files changed, 5 insertions, 17 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py index bc26ce8..d4393d5 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -460,16 +460,16 @@ def kwargs_from_env(ssl_version=None, assert_hostname=None): tls_verify = os.environ.get('DOCKER_TLS_VERIFY') if tls_verify == '': tls_verify = False - enable_tls = True else: tls_verify = tls_verify is not None - enable_tls = cert_path or tls_verify + enable_tls = cert_path or tls_verify params = {} if host: - params['base_url'] = (host.replace('tcp://', 'https://') - if enable_tls else host) + params['base_url'] = ( + host.replace('tcp://', 'https://') if enable_tls else host + ) if not enable_tls: return params diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py index 87796d1..65b7cf8 100644 --- a/tests/unit/utils_test.py +++ b/tests/unit/utils_test.py @@ -228,19 +228,7 @@ class KwargsFromEnvTest(base.BaseTestCase): DOCKER_TLS_VERIFY='') os.environ.pop('DOCKER_CERT_PATH', None) kwargs = kwargs_from_env(assert_hostname=True) - self.assertEqual('https://192.168.59.103:2376', kwargs['base_url']) - self.assertTrue('ca.pem' in kwargs['tls'].ca_cert) - self.assertTrue('cert.pem' in kwargs['tls'].cert[0]) - self.assertTrue('key.pem' in kwargs['tls'].cert[1]) - self.assertEqual(True, kwargs['tls'].assert_hostname) - self.assertEqual(False, kwargs['tls'].verify) - try: - client = Client(**kwargs) - self.assertEqual(kwargs['base_url'], client.base_url) - self.assertEqual(kwargs['tls'].cert, client.cert) - self.assertFalse(kwargs['tls'].verify) - except TypeError as e: - self.fail(e) + self.assertEqual('tcp://192.168.59.103:2376', kwargs['base_url']) def test_kwargs_from_env_no_cert_path(self): try: |