docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support version parameter in `Client.from_env` 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-08-23 16:51:52 -07:00
parent d33e069552
commit 764d7b38c4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/client.py
View File

@ -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:

8
tests/unit/client_test.py
View File

@ -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):