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

[mithrandi at users.alioth.debian.org]

    Date: Sunday, December 8, 2013 @ 00:03:50
  Author: mithrandi
Revision: 10230

Make test-shelve.t more lenient. This should hopefully fix the
semi-intermittent build failures on some architectures with slower
buildds.

Added:
  packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2013-12-07 23:12:20 UTC (rev 10229)
+++ packages/mercurial/trunk/debian/changelog	2013-12-08 00:03:50 UTC (rev 10230)
@@ -4,6 +4,9 @@
   * Fix installation in the case where there is more than one supported
     version of Python (Closes: #729153).
     - Thanks to Faheem Mitha <faheem at faheem.info> for the patch.
+  * Make test-shelve.t more lenient. This should hopefully fix the
+    semi-intermittent build failures on some architectures with slower
+    buildds.
 
  -- Tristan Seligmann <mithrandi at debian.org>  Sun, 08 Dec 2013 00:28:56 +0200
 

Added: packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch	2013-12-08 00:03:50 UTC (rev 10230)
@@ -0,0 +1,28 @@
+Author: Tristan Seligmann <mithrandi at debian.org>
+Description: Make test-shelve.t more lenient
+ When running on a slower system (eg. MIPS buildd), the age of the shelf can be
+ 10 seconds or more, resulting in the output alignment changing and thus a test
+ failure. This patch makes the spacing be matched more leniently.
+Bug: http://bz.selenic.com/show_bug.cgi?id=4124
+
+Index: mercurial-2.8.1/tests/test-shelve.t
+===================================================================
+--- mercurial-2.8.1.orig/tests/test-shelve.t	2013-12-02 04:51:10.000000000 +0200
++++ mercurial-2.8.1/tests/test-shelve.t	2013-12-08 01:28:17.505760594 +0200
+@@ -80,12 +80,12 @@
+ 
+ ensure that our shelved changes exist
+ 
+-  $ hg shelve -l
+-  default-01      (*)    [mq]: second.patch (glob)
+-  default         (*)    [mq]: second.patch (glob)
++  $ sleep 10 && hg shelve -l
++  default-01      (*)* [mq]: second.patch (glob)
++  default         (*)* [mq]: second.patch (glob)
+ 
+   $ hg shelve -l -p default
+-  default         (*)    [mq]: second.patch (glob)
++  default         (*)* [mq]: second.patch (glob)
+   
+   diff --git a/a/a b/a/a
+   --- a/a/a

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2013-12-07 23:12:20 UTC (rev 10229)
+++ packages/mercurial/trunk/debian/patches/series	2013-12-08 00:03:50 UTC (rev 10230)
@@ -9,3 +9,4 @@
 deb_specific__fix_hg-ssh_interpreter.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
 for_upstream__fix_i18n.patch
+for_upstream__lenient_test-shelve.patch