summaryrefslogtreecommitdiff
path: root/tests/unit/cli/docker_client_test.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2018-02-21 13:24:25 -0800
committerJoffrey F <joffrey@docker.com>2018-02-21 13:33:27 -0800
commitcd7ccad81ee527582992bbc225d5f485cb5e12bb (patch)
tree3da7acea1965d53c576492fdd776ed2fa6539a96 /tests/unit/cli/docker_client_test.py
parente71664385756a75f4cb14c9447138ac3c4120f3a (diff)
Retrieve certs from default path if not provided explicitly
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'tests/unit/cli/docker_client_test.py')
-rw-r--r--tests/unit/cli/docker_client_test.py21
1 files changed, 17 insertions, 4 deletions
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index 5bb4564e..be91ea31 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -68,9 +68,10 @@ class DockerClientTestCase(unittest.TestCase):
class TLSConfigTestCase(unittest.TestCase):
- ca_cert = os.path.join('tests/fixtures/tls/', 'ca.pem')
- client_cert = os.path.join('tests/fixtures/tls/', 'cert.pem')
- key = os.path.join('tests/fixtures/tls/', 'key.pem')
+ cert_path = 'tests/fixtures/tls/'
+ ca_cert = os.path.join(cert_path, 'ca.pem')
+ client_cert = os.path.join(cert_path, 'cert.pem')
+ key = os.path.join(cert_path, 'key.pem')
def test_simple_tls(self):
options = {'--tls': True}
@@ -202,7 +203,8 @@ class TLSConfigTestCase(unittest.TestCase):
def test_tls_verify_flag_no_override(self):
environment = Environment({
'DOCKER_TLS_VERIFY': 'true',
- 'COMPOSE_TLS_VERSION': 'TLSv1'
+ 'COMPOSE_TLS_VERSION': 'TLSv1',
+ 'DOCKER_CERT_PATH': self.cert_path
})
options = {'--tls': True, '--tlsverify': False}
@@ -219,6 +221,17 @@ class TLSConfigTestCase(unittest.TestCase):
options = {'--tls': True}
assert tls_config_from_options(options, environment) is True
+ def test_tls_verify_default_cert_path(self):
+ environment = Environment({'DOCKER_TLS_VERIFY': '1'})
+ options = {'--tls': True}
+ with mock.patch('compose.cli.docker_client.default_cert_path') as dcp:
+ dcp.return_value = 'tests/fixtures/tls/'
+ result = tls_config_from_options(options, environment)
+ assert isinstance(result, docker.tls.TLSConfig)
+ assert result.verify is True
+ assert result.ca_cert == self.ca_cert
+ assert result.cert == (self.client_cert, self.key)
+
class TestGetTlsVersion(object):
def test_get_tls_version_default(self):