diff --git a/tests/run-tests.sh b/tests/run-tests.sh index a7a819c..12dd371 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -31,18 +31,15 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" docker build -t internetarchive/warcprox-tests $script_dir -for python in python3 python2.7 -do - docker run --rm --volume="$script_dir/..:/warcprox" internetarchive/warcprox-tests /sbin/my_init -- \ - bash -x -c "cd /tmp && git clone /warcprox && cd /tmp/warcprox \ - && (cd /warcprox && git diff HEAD) | patch -p1 \ - && virtualenv -p $python /tmp/venv \ - && source /tmp/venv/bin/activate \ - && pip --log-file /tmp/pip.log install . pytest mock requests warcio \ - && py.test -v tests \ - && py.test -v --rethinkdb-dedup-url=rethinkdb://localhost/test1/dedup tests \ - && py.test -v --rethinkdb-big-table-url=rethinkdb://localhost/test2/captures tests \ - && py.test -v --rethinkdb-trough-db-url=rethinkdb://localhost/trough_configuration tests \ - " -done +docker run --rm --volume="$script_dir/..:/warcprox" internetarchive/warcprox-tests /sbin/my_init -- \ + bash -x -c "cd /tmp && git clone /warcprox && cd /tmp/warcprox \ + && (cd /warcprox && git diff HEAD) | patch -p1 \ + && virtualenv -p python3 /tmp/venv \ + && source /tmp/venv/bin/activate \ + && pip --log-file /tmp/pip.log install . pytest mock requests warcio \ + && py.test -v tests \ + && py.test -v --rethinkdb-dedup-url=rethinkdb://localhost/test1/dedup tests \ + && py.test -v --rethinkdb-big-table-url=rethinkdb://localhost/test2/captures tests \ + && py.test -v --rethinkdb-trough-db-url=rethinkdb://localhost/trough_configuration tests \ + "