From a87be8909562ee8d97e8dfdcc1d57d9ad3674b13 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Thu, 30 Jul 2015 11:07:17 +0000 Subject: [PATCH] Typos. Honestly --- test/600_proxy_docker_py.sh | 5 +++-- test/601_proxy_docker_py_test.sh | 1 - test/602_proxy_docker_py_test.sh | 1 - test/603_proxy_docker_py_test.sh | 1 - test/604_proxy_docker_py_test.sh | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/600_proxy_docker_py.sh b/test/600_proxy_docker_py.sh index 32c8bacc..419d225a 100755 --- a/test/600_proxy_docker_py.sh +++ b/test/600_proxy_docker_py.sh @@ -17,9 +17,10 @@ docker_py_test() { -v /tmp:/tmp \ -v /var/run/docker.sock:/var/run/docker.sock \ joffrey/docker-py) - docker cp $C:/home/docker-py/tests/integration_test.py . + docker_on $HOST1 cp $C:/home/docker-py/tests/integration_test.py . CANDIDATES=$(sed -En 's/^class (Test[[:alpha:]]+).*/\1/p' integration_test.py) + i=0 TESTS= for test in $CANDIDATES; do if [ $(($i % $TOTAL_SHARDS)) -eq $SHARD ]; then @@ -35,7 +36,7 @@ docker_py_test() { -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 "$TESTS" ; then + joffrey/docker-py python tests/integration_test.py $TESTS ; then assert_raises "true" else assert_raises "false" diff --git a/test/601_proxy_docker_py_test.sh b/test/601_proxy_docker_py_test.sh index 030d29ca..9829bc17 100755 --- a/test/601_proxy_docker_py_test.sh +++ b/test/601_proxy_docker_py_test.sh @@ -1,5 +1,4 @@ #! /bin/bash -# Explicitly not called _test.sh - this isn't run, but imported by other tests. . ./600_proxy_docker_py.sh diff --git a/test/602_proxy_docker_py_test.sh b/test/602_proxy_docker_py_test.sh index c73da5dc..742e1484 100755 --- a/test/602_proxy_docker_py_test.sh +++ b/test/602_proxy_docker_py_test.sh @@ -1,5 +1,4 @@ #! /bin/bash -# Explicitly not called _test.sh - this isn't run, but imported by other tests. . ./600_proxy_docker_py.sh diff --git a/test/603_proxy_docker_py_test.sh b/test/603_proxy_docker_py_test.sh index c48a4b07..ec8d0718 100755 --- a/test/603_proxy_docker_py_test.sh +++ b/test/603_proxy_docker_py_test.sh @@ -1,5 +1,4 @@ #! /bin/bash -# Explicitly not called _test.sh - this isn't run, but imported by other tests. . ./600_proxy_docker_py.sh diff --git a/test/604_proxy_docker_py_test.sh b/test/604_proxy_docker_py_test.sh index fc7d9994..db60bba1 100755 --- a/test/604_proxy_docker_py_test.sh +++ b/test/604_proxy_docker_py_test.sh @@ -1,5 +1,4 @@ #! /bin/bash -# Explicitly not called _test.sh - this isn't run, but imported by other tests. . ./600_proxy_docker_py.sh