[Python-modules-commits] r33940 - in packages/fedmsg/trunk/debian (changelog rules)

[olasd at users.alioth.debian.org]

    Date: Friday, August 21, 2015 @ 11:41:08
  Author: olasd
Revision: 33940

Fix test running for new dh-python (Closes: #795391)

Modified:
  packages/fedmsg/trunk/debian/changelog
  packages/fedmsg/trunk/debian/rules

Modified: packages/fedmsg/trunk/debian/changelog
===================================================================
--- packages/fedmsg/trunk/debian/changelog	2015-08-21 10:18:06 UTC (rev 33939)
+++ packages/fedmsg/trunk/debian/changelog	2015-08-21 11:41:08 UTC (rev 33940)
@@ -1,6 +1,7 @@
 fedmsg (0.9.3-2) UNRELEASED; urgency=medium
 
   * Update watch file for new pypi.debian.net redirector
+  * Fix test running for new dh-python (Closes: #795391)
 
  -- Nicolas Dandrimont <olasd at debian.org>  Fri, 21 Aug 2015 12:17:37 +0200
 

Modified: packages/fedmsg/trunk/debian/rules
===================================================================
--- packages/fedmsg/trunk/debian/rules	2015-08-21 10:18:06 UTC (rev 33939)
+++ packages/fedmsg/trunk/debian/rules	2015-08-21 11:41:08 UTC (rev 33940)
@@ -2,6 +2,7 @@
 
 UPSTREAM = $(shell dpkg-parsechangelog | egrep '^Version: ' | cut -d ' ' -f 2- | cut -d '-' -f 1)
 
+
 %:
 	dh $@ --with python2,sphinxdoc,systemd --buildsystem=pybuild
 
@@ -26,6 +27,12 @@
 override_dh_install:
 	dh_install --fail-missing
 
+override_dh_auto_test:
+	PYBUILD_SYSTEM=custom \
+	    PYBUILD_BEFORE_TEST="cp -r {dir}/fedmsg.d {build_dir}/fedmsg/tests/" \
+            PYBUILD_TEST_ARGS="{interpreter} setup.py test" \
+            dh_auto_test
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc/_build/
@@ -34,12 +41,6 @@
 override_dh_installchangelogs:
 	dh_installchangelogs -k CHANGELOG.rst
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	cp -r fedmsg.d fedmsg/tests/
-	dh_auto_test
-endif
-
 get-orig-source:
 	git clone --bare git://github.com/fedora-infra/fedmsg.git fedmsg-orig.git
 	git --git-dir=fedmsg-orig.git archive $(shell echo $(UPSTREAM) | cut -d + -f 2  | cut -d . -f 3) | gzip > ../fedmsg_$(UPSTREAM).orig.tar.gz