diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2016-08-03 16:57:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-03 16:57:21 -0700 |
| commit | 20b29d048eda8820d6d606d82f004cef50d4628b (patch) | |
| tree | a22d3d7e3bb0783697952707efc0b6295774a5da | |
| parent | 67098f38df6606ab7c75d7db64c1552efbda8f49 (diff) | |
| parent | 9d48b4f60323db22c45437892e450bf8e545d3ef (diff) | |
| download | docker-py-20b29d048eda8820d6d606d82f004cef50d4628b.tar.gz | |
Merge pull request #1151 from docker/test_fixes_1.12
Test fixes and updated Makefile for 1.12 testing
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | docker/utils/__init__.py | 13 | ||||
| -rw-r--r-- | tests/integration/container_test.py | 2 |
3 files changed, 25 insertions, 13 deletions
@@ -32,16 +32,27 @@ integration-test-py3: build-py3 integration-dind: build build-py3 docker rm -vf dpy-dind || : - docker run -d --name dpy-dind --privileged dockerswarm/dind:1.10.3 docker daemon -H tcp://0.0.0.0:2375 - docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py py.test tests/integration - docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test tests/integration + docker run -d --name dpy-dind --privileged dockerswarm/dind:1.12.0 docker daemon\ + -H tcp://0.0.0.0:2375 + docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py\ + py.test tests/integration + docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3\ + py.test tests/integration docker rm -vf dpy-dind integration-dind-ssl: build-dind-certs build build-py3 docker run -d --name dpy-dind-certs dpy-dind-certs - docker run -d --env="DOCKER_HOST=tcp://localhost:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --volumes-from dpy-dind-certs --name dpy-dind-ssl -v /tmp --privileged dockerswarm/dind:1.10.3 docker daemon --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem --tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375 - docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py py.test tests/integration - docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py3 py.test tests/integration + docker run -d --env="DOCKER_HOST=tcp://localhost:2375" --env="DOCKER_TLS_VERIFY=1"\ + --env="DOCKER_CERT_PATH=/certs" --volumes-from dpy-dind-certs --name dpy-dind-ssl\ + -v /tmp --privileged dockerswarm/dind:1.12.0 docker daemon --tlsverify\ + --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem\ + --tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375 + docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375"\ + --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs"\ + --link=dpy-dind-ssl:docker docker-py py.test tests/integration + docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375"\ + --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs"\ + --link=dpy-dind-ssl:docker docker-py3 py.test tests/integration docker rm -vf dpy-dind-ssl dpy-dind-certs flake8: build diff --git a/docker/utils/__init__.py b/docker/utils/__init__.py index ccc3819..41df004 100644 --- a/docker/utils/__init__.py +++ b/docker/utils/__init__.py @@ -1,11 +1,12 @@ +# flake8: noqa from .utils import ( compare_version, convert_port_bindings, convert_volume_binds, mkbuildcontext, tar, exclude_paths, parse_repository_tag, parse_host, - kwargs_from_env, convert_filters, datetime_to_timestamp, create_host_config, - create_container_config, parse_bytes, ping_registry, parse_env_file, - version_lt, version_gte, decode_json_header, split_command, + kwargs_from_env, convert_filters, datetime_to_timestamp, + create_host_config, create_container_config, parse_bytes, ping_registry, + parse_env_file, version_lt, version_gte, decode_json_header, split_command, create_ipam_config, create_ipam_pool, parse_devices, normalize_links, -) # flake8: noqa +) -from .types import Ulimit, LogConfig # flake8: noqa -from .decorators import check_resource, minimum_version, update_headers #flake8: noqa +from .types import Ulimit, LogConfig +from .decorators import check_resource, minimum_version, update_headers diff --git a/tests/integration/container_test.py b/tests/integration/container_test.py index 61b3398..f347c12 100644 --- a/tests/integration/container_test.py +++ b/tests/integration/container_test.py @@ -292,7 +292,7 @@ class CreateContainerTest(helpers.BaseTestCase): ) self.client.start(container) - assert expected_msg in str(excinfo.value) + assert six.b(expected_msg) in excinfo.value.explanation def test_valid_no_log_driver_specified(self): log_config = docker.utils.LogConfig( |