From b2f62cc635d505f1af5af63073944c23de24675c Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 22 Jun 2015 20:09:45 +0100 Subject: [PATCH 1/3] show test failure output step towards fixing #970 --- test/600_proxy_docker_py_test.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test/600_proxy_docker_py_test.sh b/test/600_proxy_docker_py_test.sh index b61de7a8..045c225b 100755 --- a/test/600_proxy_docker_py_test.sh +++ b/test/600_proxy_docker_py_test.sh @@ -6,11 +6,16 @@ start_suite "Run docker-py test suite against the proxy" weave_on $HOST1 launch-proxy --no-default-ipam assert_raises "docker_on $HOST1 ps | grep weaveproxy" -assert_raises "docker_on $HOST1 run \ - -e NOT_ON_HOST=true \ - -e DOCKER_HOST=tcp://172.17.42.1:12375 \ - -v /tmp:/tmp \ - -v /var/run/docker.sock:/var/run/docker.sock \ - joffrey/docker-py python tests/integration_test.py" + +if docker_on $HOST1 run \ + -e NOT_ON_HOST=true \ + -e DOCKER_HOST=tcp://172.17.42.1:12375 \ + -v /tmp:/tmp \ + -v /var/run/docker.sock:/var/run/docker.sock \ + joffrey/docker-py python tests/integration_test.py ; then + assert_raises "true" +else + assert_raises "false" +fi end_suite From 2e5e0a7730f17fd590b7cd35f1f1e231d89fd12a Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 22 Jun 2015 21:05:42 +0100 Subject: [PATCH 2/3] remove pointless assertion --- test/600_proxy_docker_py_test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/test/600_proxy_docker_py_test.sh b/test/600_proxy_docker_py_test.sh index 045c225b..332ca191 100755 --- a/test/600_proxy_docker_py_test.sh +++ b/test/600_proxy_docker_py_test.sh @@ -5,7 +5,6 @@ start_suite "Run docker-py test suite against the proxy" weave_on $HOST1 launch-proxy --no-default-ipam -assert_raises "docker_on $HOST1 ps | grep weaveproxy" if docker_on $HOST1 run \ -e NOT_ON_HOST=true \ From 1a17b41bc36de5671433746da4f08981167de7bb Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 22 Jun 2015 21:33:47 +0100 Subject: [PATCH 3/3] reduce test output noise --- test/600_proxy_docker_py_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/600_proxy_docker_py_test.sh b/test/600_proxy_docker_py_test.sh index 332ca191..84d27608 100755 --- a/test/600_proxy_docker_py_test.sh +++ b/test/600_proxy_docker_py_test.sh @@ -4,6 +4,8 @@ start_suite "Run docker-py test suite against the proxy" +docker_on $HOST1 pull joffrey/docker-py >/dev/null + weave_on $HOST1 launch-proxy --no-default-ipam if docker_on $HOST1 run \