Skip to content

Commit 73b5140

Browse files
committed
Fix integration-dind-ssl make task
Signed-off-by: Joffrey F <[email protected]>
1 parent de61737 commit 73b5140

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ integration-dind: build build-py3
3939
integration-dind-ssl: build-dind-certs build build-py3
4040
docker run -d --name dpy-dind-certs dpy-dind-certs
4141
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
42-
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
43-
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
42+
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
43+
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
4444
docker rm -vf dpy-dind-ssl dpy-dind-certs
4545

4646
flake8: build

tests/integration/container_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ def test_pause_unpause(self):
10411041
self.assertEqual(state['Paused'], False)
10421042

10431043

1044-
class GetContainerStatsTest(api_test.BaseTestCase):
1044+
class GetContainerStatsTest(helpers.BaseTestCase):
10451045
@requires_api_version('1.19')
10461046
def test_get_container_stats_no_stream(self):
10471047
container = self.client.create_container(

0 commit comments

Comments
 (0)