Cope with changes in docker-py structure.

Tests are now in a different directory, and get sharded by module rather than individually.
weaveworks · Nov 13, 2015 · 804e6ba · 804e6ba
1 parent af3fc82
commit 804e6ba
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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*<UnitTestCase '([[:alpha:]]+)'>/\1/p")
+      py.test --collect-only tests/integration/ \
+      | sed -En "s/\s*<Module '([[:print:]]+)'>/\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