[Python-apps-commits] r10311 - in packages/mercurial/trunk/debian (3 files)

[vicho at users.alioth.debian.org]

    Date: Friday, January 3, 2014 @ 20:08:12
  Author: vicho
Revision: 10311

blacklist check_pyflakes instead of deleting the test

Added:
  packages/mercurial/trunk/debian/mercurial.test_blacklist
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/rules

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2014-01-02 16:41:52 UTC (rev 10310)
+++ packages/mercurial/trunk/debian/changelog	2014-01-03 20:08:12 UTC (rev 10311)
@@ -1,3 +1,9 @@
+mercurial (2.8.2-2) UNRELEASED; urgency=medium
+
+  * blacklist check_pyflakes instead of deleting the test
+
+ -- Javi Merino <vicho at debian.org>  Fri, 03 Jan 2014 20:57:20 +0100
+
 mercurial (2.8.2-1) unstable; urgency=medium
 
   * New upstream release

Added: packages/mercurial/trunk/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/trunk/debian/mercurial.test_blacklist	                        (rev 0)
+++ packages/mercurial/trunk/debian/mercurial.test_blacklist	2014-01-03 20:08:12 UTC (rev 10311)
@@ -0,0 +1 @@
+test-check-pyflakes.t

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2014-01-02 16:41:52 UTC (rev 10310)
+++ packages/mercurial/trunk/debian/rules	2014-01-03 20:08:12 UTC (rev 10311)
@@ -39,7 +39,7 @@
 		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t
 endif
 
-	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 1440 $(PARALLEL_TEST_JOBS)"
+	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 1440 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
 
 	rename.ul .deb-backup '' $(CURDIR)/tests/*
 endif
@@ -103,10 +103,6 @@
 	mv mercurial/__version__.py.save mercurial/__version__.py
 	$(RM) -rv tmp/
 
-override_dh_clean:
-	dh_clean
-	-rm -f tests/test-check-pyflakes.t
-
 mercurial/__version__.py:
 	@echo "$@ is missing (you probably call 'make clean' directly)."
 	@echo "Restore it from sources before building the package"