From: Tom Clegg <tom@tomclegg.ca>
Date: Fri, 14 Feb 2020 20:13:15 +0000 (-0500)
Subject: Merge branch '12308-cgofuse'
X-Git-Tag: 2.1.0~297
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/db791b7a682627e0d3e2f1efc821dc3b0f311942?hp=-c

Merge branch '12308-cgofuse'

refs #12308

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

db791b7a682627e0d3e2f1efc821dc3b0f311942
diff --combined build/run-tests.sh
index c4c5335596,8fe51e4794..891faca419
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -90,6 -90,7 +90,7 @@@ lib/dispatchcloud/containe
  lib/dispatchcloud/scheduler
  lib/dispatchcloud/ssh_executor
  lib/dispatchcloud/worker
+ lib/mount
  lib/service
  services/api
  services/arv-git-httpd
@@@ -647,8 -648,8 +648,8 @@@ install_env() 
      . "$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.
@@@ -1099,7 -1100,6 +1100,7 @@@ install_deps() 
      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