15954: Merge branch 'master'

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

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 2bcfbb84d2d76fec6be521053d0831a0315937c5..ad800dfd07d057ba8ac8ddae450a8676a2d7df59 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -90,6 +90,7 @@ lib/dispatchcloud/container
 lib/dispatchcloud/scheduler
 lib/dispatchcloud/ssh_executor
 lib/dispatchcloud/worker
 lib/dispatchcloud/scheduler
 lib/dispatchcloud/ssh_executor
 lib/dispatchcloud/worker

+lib/mount

 lib/service
 services/api
 services/arv-git-httpd
 lib/service
 services/api
 services/arv-git-httpd


@@ -647,8 +648,8 @@ install_env() {
     . "$VENVDIR/bin/activate"
 
     # Needed for run_test_server.py which is used by certain (non-Python) tests.
     . "$VENVDIR/bin/activate"
 
     # Needed for run_test_server.py which is used by certain (non-Python) tests.

-    pip install --no-cache-dir PyYAML future \
-        || fatal "pip install PyYAML failed"
+    pip install --no-cache-dir PyYAML future httplib2 \
+        || fatal "`pip install PyYAML future httplib2` failed"

 
     # Preinstall libcloud if using a fork; otherwise nodemanager "pip
     # install" won't pick it up by default.
 
     # Preinstall libcloud if using a fork; otherwise nodemanager "pip
     # install" won't pick it up by default.


@@ -1099,6 +1100,7 @@ install_deps() {
     do_install sdk/cli
     do_install sdk/perl
     do_install sdk/python pip
     do_install sdk/cli
     do_install sdk/perl
     do_install sdk/python pip

+    do_install sdk/python pip3

     do_install sdk/ruby
     do_install services/api
     do_install services/arv-git-httpd go
     do_install sdk/ruby
     do_install services/api
     do_install services/arv-git-httpd go