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

[vicho at users.alioth.debian.org]

    Date: Wednesday, October 2, 2013 @ 22:55:04
  Author: vicho
Revision: 10045

Reenable the testsuite as the tests that timeout can be blacklisted

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2013-10-02 20:40:39 UTC (rev 10044)
+++ packages/mercurial/trunk/debian/changelog	2013-10-02 22:55:04 UTC (rev 10045)
@@ -2,6 +2,7 @@
 
   * New upstream release
   * Revert breaks of mercurial-git back to << 0.4.0-1 (Closes: #725145)
+  * Reenable the testsuite as the tests that timeout can be blacklisted
 
  -- Javi Merino <vicho at debian.org>  Wed, 02 Oct 2013 20:50:25 +0100
 

Modified: packages/mercurial/trunk/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/trunk/debian/mercurial.test_blacklist	2013-10-02 20:40:39 UTC (rev 10044)
+++ packages/mercurial/trunk/debian/mercurial.test_blacklist	2013-10-02 22:55:04 UTC (rev 10045)
@@ -11,6 +11,7 @@
 
 # No such file or directory /usr/share/mercurial/help/revsets.txt (?)
 test-bookmarks.t
+test-extension.t
 test-help.t
 test-mq.t
 test-transplant.t
@@ -20,3 +21,36 @@
 
 # I'm missing some locales or something (?)
 test-i18n.t
+
+# No hgweb templates
+test-archive.t
+test-hgweb.t
+test-hgweb-commands.t
+test-hgweb-descend-empties.t
+test-hgweb-diffs.t
+test-hgweb-empty.t
+test-hgweb-filelog.t
+test-hgweb-non-interactive.t
+test-hgweb-nopath.t
+test-hgweb-no-path-info.t
+test-hgweb-no-request-uri.t
+test-hgweb-raw.t
+test-hgwebdir.t
+test-hgwebdirsym.t
+test-keyword.t
+test-newcgi.t
+test-newercgi.t
+test-oldcgi.t
+test-share.t
+test-websub.t
+
+# local server failed (?)
+test-hgweb-removed.t
+test-largefiles.t
+test-mq-qclone-http.t
+test-mq-qimport.t
+test-obsolete.t
+test-subrepo-relative-path.t
+
+# no port number associated with service 'daytime' (this should be easily solvable)
+test-serve.t

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2013-10-02 20:40:39 UTC (rev 10044)
+++ packages/mercurial/trunk/debian/rules	2013-10-02 22:55:04 UTC (rev 10045)
@@ -23,22 +23,22 @@
 ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T)
 
 override_dh_auto_test:
-# ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-# # test-pull-pull-corruption tries to execute two hg commands at the
-# # same time to test for corruption.  It does so by running an hg
-# # command in the background, sleeping one second and running the
-# # second command.  In architectures with slow buildds, one second is
-# # not enough and the second test starts before the first one has
-# # started printing.  This is hacky and we just enhance the hack by
-# # incrementing the sleep time in those architectures.
-# ifneq ($(or $(ARCH_IS_MIPS), $(ARCH_IS_KFREEBSD-i386), $(ARCH_IS_ARMEL), $(ARCH_IS_SPARC)),)
-# 		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t
-# endif
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+# test-pull-pull-corruption tries to execute two hg commands at the
+# same time to test for corruption.  It does so by running an hg
+# command in the background, sleeping one second and running the
+# second command.  In architectures with slow buildds, one second is
+# not enough and the second test starts before the first one has
+# started printing.  This is hacky and we just enhance the hack by
+# incrementing the sleep time in those architectures.
+ifneq ($(or $(ARCH_IS_MIPS), $(ARCH_IS_KFREEBSD-i386), $(ARCH_IS_ARMEL), $(ARCH_IS_SPARC)),)
+		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 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
+	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
 
-# 	rename.ul .deb-backup '' $(CURDIR)/tests/*
-# endif
+	rename.ul .deb-backup '' $(CURDIR)/tests/*
+endif
 
 build-python%: mercurial/__version__.py
 	python$* setup.py build