From 804e6ba5860552f41f513d2b674ee76f48bc8181 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 13 Nov 2015 11:08:57 +0000 Subject: [PATCH] Cope with changes in docker-py structure. Tests are now in a different directory, and get sharded by module rather than individually. --- test/600_proxy_docker_py.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/600_proxy_docker_py.sh b/test/600_proxy_docker_py.sh index ce9a0250..57ee606a 100755 --- a/test/600_proxy_docker_py.sh +++ b/test/600_proxy_docker_py.sh @@ -13,14 +13,14 @@ docker_py_test() { docker_on $HOST1 pull joffrey/docker-py >/dev/null CANDIDATES=$(docker_on $HOST1 run \ joffrey/docker-py \ - py.test --collect-only tests/integration_test.py \ - | sed -En "s/\s*/\1/p") + py.test --collect-only tests/integration/ \ + | sed -En "s/\s*/\1/p") i=0 TESTS= for test in $CANDIDATES; do if [ $(($i % $TOTAL_SHARDS)) -eq $SHARD ]; then - TESTS="$TESTS tests/integration_test.py::$test" + TESTS="$TESTS $test" fi i=$(($i + 1)) done