14287: Merge branch 'master' into 14287-federated-list

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

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 3c69ae91d639aea47452728de856fe8f66de8f01..7c21a296406d42c7f06fbc88fcfcae0dd2509ad8 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -658,6 +658,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
@@ -926,6 +927,7 @@ install_services/login-sync() {
 }
 
 install_services/api() {
+    stop_services
     cd "$WORKSPACE/services/api" \
         && RAILS_ENV=test bundle_install_trylocal