From a23c0237c3fbc7ebb7b48b11ec043dcbc173b510 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Tue, 1 Sep 2015 09:58:05 +0100 Subject: [PATCH] using --collect-only so we don't miss tests --- test/600_proxy_docker_py.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/600_proxy_docker_py.sh b/test/600_proxy_docker_py.sh index 8f73c430..f03d9103 100755 --- a/test/600_proxy_docker_py.sh +++ b/test/600_proxy_docker_py.sh @@ -13,13 +13,10 @@ docker_py_test() { docker_on $HOST1 pull busybox >/dev/null # Get a list of the tests for use to shard docker_on $HOST1 pull joffrey/docker-py >/dev/null - C=$(docker_on $HOST1 create \ - -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) - CANDIDATES=$(docker_on $HOST1 cp $C:/home/docker-py/tests/integration_test.py - | sed -En 's/^class (Test[[:alpha:]]+).*/\1/p') + CANDIDATES=$(docker_on $HOST1 run \ + joffrey/docker-py \ + py.test --collect-only tests/integration_test.py \ + | sed -En "s/\s*/\1/p") i=0 TESTS=