Revert "does it still hang if we don't really run anything inside docker?"

This reverts commit e1474133b638e1f442b812ee794a79b6038f6a69.

Conflicts:
	tests/run-tests.sh
This commit is contained in:
Noah Levitt 2015-10-06 00:57:15 +00:00
parent d24f2d8036
commit 7c7b0dc991

View File

@ -9,12 +9,11 @@ user=$(id -un)
for python in python2.7 python3.4
do
docker run -i --rm --volume="$script_dir/..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- \
true < /dev/null
# bash -x -c "cd /rethinkstuff \
# && virtualenv -p $python /tmp/venv \
# && source /tmp/venv/bin/activate \
# && pip install pytest . \
# && py.test -v -s tests"
docker run --rm --volume="$script_dir/..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- \
bash -x -c "cd /rethinkstuff \
&& virtualenv -p $python /tmp/venv \
&& source /tmp/venv/bin/activate \
&& pip install pytest . \
&& py.test -v -s tests"
done