From: Tom Clegg <tom@curoverse.com>
Date: Mon, 7 Mar 2016 19:28:10 +0000 (-0500)
Subject: 8345: Uninstall old llfuse from reused virtualenv, if necessary.
X-Git-Url: https://git.arvados.org/arvados-dev.git/commitdiff_plain/2b9b7518a60a71315a1504bf96b3182122bec702?ds=sidebyside

8345: Uninstall old llfuse from reused virtualenv, if necessary.
---

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 1289095..a17d610 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -425,6 +425,12 @@ pip freeze 2>/dev/null | egrep ^apache-libcloud==$LIBCLOUD_PIN \
     || pip install --pre --ignore-installed https://github.com/curoverse/libcloud/archive/apache-libcloud-$LIBCLOUD_PIN.zip >/dev/null \
     || fatal "pip install apache-libcloud failed"
 
+# Uninstall old llfuse, because services/fuse "pip install" won't
+# upgrade it by default.
+if pip freeze | egrep '^llfuse==0\.41\.'; then
+    yes | pip uninstall 'llfuse<0.42'
+fi
+
 # Deactivate Python 2 virtualenv
 deactivate