diff options
| author | Joffrey F <joffrey@docker.com> | 2015-11-18 15:36:17 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-11-18 15:41:32 -0800 |
| commit | 73b51400a109db0e4cfbd0972bc84a4ecba61671 (patch) | |
| tree | 44e944df57fbc3eeb44aa3f6cceee3cdd74044cd | |
| parent | de617375f1fb37eae60a5af6b4a2d7ef1f8fd70a (diff) | |
| download | docker-py-852-independent-integration.tar.gz | |
Fix integration-dind-ssl make task852-independent-integration
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | tests/integration/container_test.py | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -39,8 +39,8 @@ integration-dind: build build-py3 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.9.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_test.py - 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_test.py + 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/tests/integration/container_test.py b/tests/integration/container_test.py index 100ba60..8cb4e97 100644 --- a/tests/integration/container_test.py +++ b/tests/integration/container_test.py @@ -1041,7 +1041,7 @@ class PauseTest(helpers.BaseTestCase): self.assertEqual(state['Paused'], False) -class GetContainerStatsTest(api_test.BaseTestCase): +class GetContainerStatsTest(helpers.BaseTestCase): @requires_api_version('1.19') def test_get_container_stats_no_stream(self): container = self.client.create_container( |