From 7c7b0dc99184922c2de517102ae181b6213bcc5f Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Tue, 6 Oct 2015 00:57:15 +0000
Subject: [PATCH] Revert "does it still hang if we don't really run anything
 inside docker?"

This reverts commit e1474133b638e1f442b812ee794a79b6038f6a69.

Conflicts:
	tests/run-tests.sh
---
 tests/run-tests.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 3a1ecdb..bddcf60 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -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