From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 31 Jul 2015 22:49:33 +0000 (+0200)
Subject: jenkins-build: run test suite from `pip install` using source tarball
X-Git-Tag: 0.4.0~8^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e2cbaff3773021e46207f4098ece2be380439385;p=fdroidserver.git

jenkins-build: run test suite from `pip install` using source tarball

Since `python setup.py sdist` provides the actual tarball that will be
installed via `easy_install`, `pip install`, etc. it should also be tested.
The existing `pip install -e $WORKSPACE` tests the .egg-link install format
---

diff --git a/jenkins-build b/jenkins-build
index cb94ebdf..7e54312d 100755
--- a/jenkins-build
+++ b/jenkins-build
@@ -50,13 +50,21 @@ cd $WORKSPACE/tests
 
 
 #------------------------------------------------------------------------------#
-# test building the source tarball
+# test building the source tarball, then installing it
 cd $WORKSPACE
 python2 setup.py sdist
 
+rm -rf $WORKSPACE/env
+virtualenv --python=python2 $WORKSPACE/env
+. $WORKSPACE/env/bin/activate
+pip install dist/fdroidserver-*.tar.gz
+
+# run tests in new pip+virtualenv install
+fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource
+
 
 #------------------------------------------------------------------------------#
-# test install using site packages
+# test install using install direct from git repo
 cd $WORKSPACE
 rm -rf $WORKSPACE/env
 virtualenv --python=python2 --system-site-packages $WORKSPACE/env
@@ -65,7 +73,6 @@ pip install -e $WORKSPACE
 python2 setup.py install
 
 # run tests in new pip+virtualenv install
-. $WORKSPACE/env/bin/activate
 fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource