[Python-apps-commits] r8240 - in packages/mercurial/trunk/debian (changelog rules)

[vicho at users.alioth.debian.org]

    Date: Monday, February 27, 2012 @ 23:18:19
  Author: vicho
Revision: 8240

Increment the sleeps in the testsuite in mips so that the test produces the same output than in faster architectures

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/rules	(contents, properties)

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-02-27 23:18:15 UTC (rev 8239)
+++ packages/mercurial/trunk/debian/changelog	2012-02-27 23:18:19 UTC (rev 8240)
@@ -6,8 +6,10 @@
     wheezy as tkcvs provides tkdiff (see bug #483362).
   * Suggest more visual diff commands
   * Increment test timeout.  test-bisect2.t timed out on mips.
+  * Increment the sleeps in the testsuite in mips so that the test
+    produces the same output than in faster architectures
 
- -- Javi Merino <vicho at debian.org>  Sun, 26 Feb 2012 16:16:30 +0000
+ -- Javi Merino <vicho at debian.org>  Mon, 27 Feb 2012 23:13:57 +0000
 
 mercurial (2.1-2) experimental; urgency=low
 

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2012-02-27 23:18:15 UTC (rev 8239)
+++ packages/mercurial/trunk/debian/rules	2012-02-27 23:18:19 UTC (rev 8240)
@@ -5,6 +5,7 @@
 	dh $@ --with python2
 
 PYVERS=$(shell pyversions -vs)
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 override_dh_auto_build: $(PYVERS:%=build-python%)
 	$(MAKE) -C doc man
@@ -17,6 +18,18 @@
 endif
 
 override_dh_auto_test:
+	# Some tests try to execute two hg commands at the same time
+	# to test for corruption.  They do so by running an hg command
+	# in the background, sleeping one second and running the
+	# second command.  In slow architectures, 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 slow
+	# architectures.
+ifeq ($(DEB_HOST_ARCH),mips)
+		sed -i -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t $(CURDIR)/tests/test-pull-pull-corruption2.t
+endif
+
 	dh_auto_test -- TESTFLAGS="--timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
 
 build-python%: mercurial/__version__.py