From 7e96d65f960b1d0dd4fe047e88ef212242b85120 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Fri, 2 Oct 2015 01:28:29 +0000 Subject: [PATCH] ugh wait that long for travis to find this mistake --- .travis.yml | 2 +- tests/run-tests.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2970d65..7757832 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,5 +11,5 @@ services: before_install: - docker build -t internetarchive/rethinkdb tests script: - - docker run --rm -i -t --volume="$TRAVIS_BUILD_DIR:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- bash -x -c "cd /rethinkstuff && /tmp/venv && source /tmp/venv/bin/activate && pip install pytest . && py.test -v -s tests" + - docker run --rm -i -t --volume="$TRAVIS_BUILD_DIR:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- bash -x -c "cd /rethinkstuff && virtualenv /tmp/venv && source /tmp/venv/bin/activate && pip install pytest . && py.test -v -s tests" diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 3e482f8..4b5156e 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 --rm -i -t --volume="$script_dir/..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- \ - bash -x -c "adduser --gecos=$user --disabled-password --quiet --uid=$uid $user \ - && sudo -u $user bash -x -c 'cd /rethinkstuff \ + docker run --net=host --rm -i -t --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'" + && py.test -v -s tests" done