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

[vicho at users.alioth.debian.org]

    Date: Wednesday, February 29, 2012 @ 08:50:08
  Author: vicho
Revision: 8241

Ignore the output of chmod in a test so that the testsuite doesn't fail in kfreebsd-*

Added:
  packages/mercurial/trunk/debian/patches/for_upstream__test_false_positive_kfreebsd.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-02-27 23:18:19 UTC (rev 8240)
+++ packages/mercurial/trunk/debian/changelog	2012-02-29 08:50:08 UTC (rev 8241)
@@ -8,8 +8,10 @@
   * 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
+  * Ignore the output of chmod in a test so that the testsuite doesn't
+    fail in kfreebsd-*
 
- -- Javi Merino <vicho at debian.org>  Mon, 27 Feb 2012 23:13:57 +0000
+ -- Javi Merino <vicho at debian.org>  Wed, 29 Feb 2012 08:29:18 +0000
 
 mercurial (2.1-2) experimental; urgency=low
 

Added: packages/mercurial/trunk/debian/patches/for_upstream__test_false_positive_kfreebsd.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__test_false_positive_kfreebsd.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/for_upstream__test_false_positive_kfreebsd.patch	2012-02-29 08:50:08 UTC (rev 8241)
@@ -0,0 +1,17 @@
+Author: Javi Merino <vicho at debian.org>
+Description: Fix a false positive fail in a test on kfreebsd-*
+ test-inherit-mode fails on kfreebsd-* because of differences in the
+ output of chmod.  This is not a real failure, so don't flag it as
+ such.
+Forwarded: No
+--- a/tests/test-inherit-mode.t
++++ b/tests/test-inherit-mode.t
+@@ -138,7 +138,7 @@
+   $ hg init setgid
+   $ cd setgid
+   $ chmod g+rwx .hg/store
+-  $ chmod g+s .hg/store 2> /dev/null
++  $ chmod g+s .hg/store > /dev/null 2> /dev/null
+   $ mkdir dir
+   $ touch dir/file
+   $ hg ci -qAm 'add dir/file'

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2012-02-27 23:18:19 UTC (rev 8240)
+++ packages/mercurial/trunk/debian/patches/series	2012-02-29 08:50:08 UTC (rev 8241)
@@ -8,3 +8,4 @@
 deb_specific__disable_libdir_replacement.patch
 deb_specific__no_optim_bdiff_armel.patch
 deb_specific__fix_hg-ssh_interpreter.patch
+for_upstream__test_false_positive_kfreebsd.patch