From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 15 Sep 2017 21:25:07 +0000 (+0200)
Subject: tests: support Ubuntu/trusty's python3.4-venv
X-Git-Tag: 0.9~74^2~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d1f6126dea7ecbdce1c86c041f22a8ae542e8b21;p=fdroidserver.git

tests: support Ubuntu/trusty's python3.4-venv
---

diff --git a/tests/complete-ci-tests b/tests/complete-ci-tests
index b09e111d..9792b5bf 100755
--- a/tests/complete-ci-tests
+++ b/tests/complete-ci-tests
@@ -47,6 +47,18 @@ export PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH
 cd $WORKSPACE/tests
 ./run-tests $apksource
 
+#------------------------------------------------------------------------------#
+# find pyvenv, to support Ubuntu/trusty's python3.4-venv
+
+if which pyvenv; then
+    pyvenv=pyvenv
+elif which pyvenv-3.4; then
+    pyvenv=pyvenv-3.4
+else
+    echo "pyvenv required to run this test suite!"
+    exit 1
+fi
+
 
 #------------------------------------------------------------------------------#
 # test building the source tarball, then installing it
@@ -54,7 +66,7 @@ cd $WORKSPACE
 python3 setup.py sdist
 
 rm -rf $WORKSPACE/env
-pyvenv $WORKSPACE/env
+$pyvenv $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
 # workaround https://github.com/pypa/setuptools/issues/937
 pip3 install setuptools==33.1.1
@@ -68,7 +80,7 @@ fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource
 # test install using install direct from git repo
 cd $WORKSPACE
 rm -rf $WORKSPACE/env
-pyvenv $WORKSPACE/env
+$pyvenv $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
 # workaround https://github.com/pypa/setuptools/issues/937
 pip3 install setuptools==33.1.1