From ef2fb0aaa47e6975c054dd23dd8e4bf75b0a6fe3 Mon Sep 17 00:00:00 2001
From: Oliver Charlesworth <oliver.charlesworth@twosigmaiq.com>
Date: Sat, 7 Apr 2018 23:13:06 +0100
Subject: [PATCH] Decouple from run-tests.sh

---
 .travis.yml  | 3 ++-
 run-tests.sh | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 47cb97d4..6095a6eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,8 @@ install:
 # command to run the dependencies
 script:
   - 'if [[ -n "$RUN_INTEGRATION_TESTS" ]]; then rm -fr ~/.cache/pip; fi'
-  - "pipenv run bash ./run-tests.sh"
+  - 'export PYPI_VENDOR_DIR="$(pwd)/tests/pypi/"'
+  - 'pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream'
 
 jobs:
   include:
diff --git a/run-tests.sh b/run-tests.sh
index 873f8273..be342245 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -5,8 +5,7 @@
 set -eo pipefail
 
 # Set the PYPI vendor URL for pytest-pypi.
-PYPI_VENDOR_DIR="$(pwd)/tests/pypi/"
-export PYPI_VENDOR_DIR
+export PYPI_VENDOR_DIR="$(pwd)/tests/pypi/"
 
 if [[ ! -z "$TEST_SUITE" ]]; then
 	echo "Using TEST_SUITE=$TEST_SUITE"