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

Merge pull request #7694 from ulyssessouza/fix-docker-api-version-unit-tests 

Update tests to use the version on docker client
This commit is contained in:
Anca Iordache 2020-08-21 17:02:56 +02:00 committed by GitHub
parent 81ce72c952 5bbd670166
commit 589179a0e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/cli/docker_client_test.py
View File

@ -6,6 +6,7 @@ import docker
import pytest import pytest
import compose import compose
from compose import const
from compose.cli import errors from compose.cli import errors
from compose.cli.docker_client import docker_client from compose.cli.docker_client import docker_client
from compose.cli.docker_client import get_tls_version from compose.cli.docker_client import get_tls_version
@ -23,18 +24,18 @@ class DockerClientTestCase(unittest.TestCase):
del os.environ['HOME'] del os.environ['HOME']
except KeyError: except KeyError:
pass pass
docker_client(os.environ) docker_client(os.environ, version=const.API_VERSIONS[const.COMPOSE_SPEC])
@mock.patch.dict(os.environ) @mock.patch.dict(os.environ)
def test_docker_client_with_custom_timeout(self): def test_docker_client_with_custom_timeout(self):
os.environ['COMPOSE_HTTP_TIMEOUT'] = '123' os.environ['COMPOSE_HTTP_TIMEOUT'] = '123'
client = docker_client(os.environ) client = docker_client(os.environ, version=const.API_VERSIONS[const.COMPOSE_SPEC])
assert client.timeout == 123 assert client.timeout == 123
@mock.patch.dict(os.environ) @mock.patch.dict(os.environ)
def test_custom_timeout_error(self): def test_custom_timeout_error(self):
os.environ['COMPOSE_HTTP_TIMEOUT'] = '123' os.environ['COMPOSE_HTTP_TIMEOUT'] = '123'
client = docker_client(os.environ) client = docker_client(os.environ, version=const.API_VERSIONS[const.COMPOSE_SPEC])
with mock.patch('compose.cli.errors.log') as fake_log: with mock.patch('compose.cli.errors.log') as fake_log:
with pytest.raises(errors.ConnectionError): with pytest.raises(errors.ConnectionError):
@ -54,7 +55,7 @@ class DockerClientTestCase(unittest.TestCase):
assert '123' in fake_log.error.call_args[0][0] assert '123' in fake_log.error.call_args[0][0]
def test_user_agent(self): def test_user_agent(self):
client = docker_client(os.environ) client = docker_client(os.environ, version=const.API_VERSIONS[const.COMPOSE_SPEC])
expected = "docker-compose/{} docker-py/{} {}/{}".format( expected = "docker-compose/{} docker-py/{} {}/{}".format(
compose.__version__, compose.__version__,
docker.__version__, docker.__version__,