Merge branch '12020-flaky-py-test'

[arvados.git] / build / run-tests.sh

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 3cf96f3b4ae01eb85873d5f8cfca9ce1dbfd8995..a46f2ec7660590cd82a3969e22ebecaceafe1dc2 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -672,6 +672,7 @@ install_env() {
         cd "$GOPATH/src/git.curoverse.com/arvados.git"
         go get -v -d ...
         "$GOPATH/bin/govendor" sync
+        which goimports >/dev/null || go get golang.org/x/tools/cmd/goimports
     ) || fatal "Go setup failed"
 
     setup_virtualenv "$VENVDIR" --python python2.7
@@ -943,6 +944,7 @@ install_services/login-sync() {
 }
 
 install_services/api() {
+    stop_services
     cd "$WORKSPACE/services/api" \
         && RAILS_ENV=test bundle_install_trylocal