Merge branch '12416-s3-empty-object'

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

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 905e51678399b292f846967fa1777d761199958f..81c6612ed54b44483c46c3309f42bddf843a5e7d 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -204,6 +204,9 @@ sanity_checks() {
     echo -n 'gitolite: '
     which gitolite \
         || fatal "No gitolite. Try: apt-get install gitolite3"
+    echo -n 'npm: '
+    which npm \
+          || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v6.11.2/node-v6.11.2-linux-x64.tar.xz | sudo tar -C /usr/local -xJf - && sudo ln -s ../node-v6.11.2-linux-x64/bin/{node,npm} /usr/local/bin/"
 }
 
 rotate_logfile() {
@@ -474,7 +477,7 @@ pip freeze | grep -x llfuse==1.2.0 || (
     yes | pip uninstall llfuse || true
     cython --version || fatal "no cython; try sudo apt-get install cython"
     cd "$temp"
-    (cd python-llfuse || git clone https://github.com/curoverse/python-llfuse)
+    (cd python-llfuse 2>/dev/null || git clone https://github.com/curoverse/python-llfuse)
     cd python-llfuse
     git checkout 620722fd990ea642ddb8e7412676af482c090c0c
     git checkout setup.py
@@ -818,7 +821,8 @@ done
 install_workbench() {
     cd "$WORKSPACE/apps/workbench" \
         && mkdir -p tmp/cache \
-        && RAILS_ENV=test bundle_install_trylocal
+        && RAILS_ENV=test bundle_install_trylocal \
+        && RAILS_ENV=test RAILS_GROUPS=assets bundle exec rake npm:install
 }
 do_install apps/workbench workbench