diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2016-08-25 14:59:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 14:59:46 -0700 |
| commit | 24bfb99e05d57a7a098a81fb86ea7b93cff62661 (patch) | |
| tree | 945200ba2ce1f2dd7cab8afe3598001b67638840 | |
| parent | 2ef02df2f06fafe7d71c96bac1e18d68217703ab (diff) | |
| parent | 764d7b38c484f8dd45eafb47d0add602de5d3ada (diff) | |
| download | docker-py-24bfb99e05d57a7a098a81fb86ea7b93cff62661.tar.gz | |
Merge pull request #1167 from docker/1075-from-env-version
Support version parameter in `Client.from_env`
| -rw-r--r-- | docker/client.py | 3 | ||||
| -rw-r--r-- | tests/unit/client_test.py | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docker/client.py b/docker/client.py index d1c6ee5..ef718a7 100644 --- a/docker/client.py +++ b/docker/client.py @@ -114,7 +114,8 @@ class Client( @classmethod def from_env(cls, **kwargs): - return cls(**kwargs_from_env(**kwargs)) + version = kwargs.pop('version', None) + return cls(version=version, **kwargs_from_env(**kwargs)) def _retrieve_server_version(self): try: diff --git a/tests/unit/client_test.py b/tests/unit/client_test.py index b21f1d6..6ceb8cb 100644 --- a/tests/unit/client_test.py +++ b/tests/unit/client_test.py @@ -25,6 +25,14 @@ class ClientTest(base.BaseTestCase): client = Client.from_env() self.assertEqual(client.base_url, "https://192.168.59.103:2376") + def test_from_env_with_version(self): + os.environ.update(DOCKER_HOST='tcp://192.168.59.103:2376', + DOCKER_CERT_PATH=TEST_CERT_DIR, + DOCKER_TLS_VERIFY='1') + client = Client.from_env(version='2.32') + self.assertEqual(client.base_url, "https://192.168.59.103:2376") + self.assertEqual(client._version, '2.32') + class DisableSocketTest(base.BaseTestCase): class DummySocket(object): |