[SCM] mediagoblin/master: Enable testsuite (but ignore failure when targeting experimental).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 14f48b6468e51b2a4fc63fee4fdb579a1e331e0f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Aug 21 12:19:12 2017 +0200

    Enable testsuite (but ignore failure when targeting experimental).

diff --git a/debian/rules b/debian/rules
index 65f79a6..b7102a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# resolve if release is experimental
+include /usr/share/dpkg/pkg-info.mk
+EXP_RELEASE = $(filter experimental% UNRELEASED,$(DEB_DISTRIBUTION))
+
 export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/mediagoblin/ --install-scripts=/usr/share/mediagoblin/
-export PYBUILD_DISABLE = test
+export PYBUILD_TEST_PYTEST = 1
 
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
@@ -27,6 +31,10 @@ override_dh_auto_build:
 	dh_auto_build
 	$(MAKE) -C docs html info
 
+# ignore testuite failure when targeting experimental
+override_dh_auto_test:
+	dh_auto_test$(if $(EXP_RELEASE), || true)
+
 override_dh_installchangelogs:
 	dh_installchangelogs docs/source/siteadmin/relnotes.rst
 

-- 
mediagoblin packaging