From: Debian Python Team <team+python@tracker.debian.org>
Date: Wed, 25 Aug 2021 17:54:04 +0000 (+0100)
Subject: deb_specific__which_silence_warning
X-Git-Tag: archive/raspbian/5.9-3+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=28f855d2dedb907efab71ab172eaed867bd72131;p=mercurial.git

deb_specific__which_silence_warning


Gbp-Pq: Name deb_specific__which_silence_warning.patch
---

diff --git a/tests/test-archive.t b/tests/test-archive.t
index 8670c01..1fe349f 100644
--- a/tests/test-archive.t
+++ b/tests/test-archive.t
@@ -578,7 +578,7 @@ test xz support only available in Python 3.4
 
 #if lzma
   $ hg archive ../archive.txz
-  $ which xz >/dev/null && xz -l ../archive.txz | head -n1 || true
+  $ which xz >/dev/null 2>&1 && xz -l ../archive.txz | head -n1 || true
   Strms  Blocks   Compressed Uncompressed  Ratio  Check   Filename (xz !)
   $ rm -f ../archive.txz
 #endif
diff --git a/tests/test-convert-cvsnt-mergepoints.t b/tests/test-convert-cvsnt-mergepoints.t
index 54416fe..bccf25d 100644
--- a/tests/test-convert-cvsnt-mergepoints.t
+++ b/tests/test-convert-cvsnt-mergepoints.t
@@ -102,7 +102,7 @@ return to trunk and merge MYBRANCH1_2
   retrieving revision 1.1.2.2.2.1
   Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt
   $ cvsci -m "merge2" foo.txt
-  $ REALCVS=`which cvs`
+  $ REALCVS=`which cvs 2>/dev/null`
   $ echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat \"$TESTDIR/test-convert-cvsnt-mergepoints.rlog\"; exit 0; fi; done; $REALCVS \$*" > ../cvs
   $ chmod +x ../cvs
   $ PATH=..:${PATH} hg debugcvsps --parents foo
diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
index 88adb39..df9b6c0 100644
--- a/tests/test-run-tests.t
+++ b/tests/test-run-tests.t
@@ -21,7 +21,7 @@ Define a helper to avoid the install step
 error paths
 
 #if symlink
-  $ ln -s `which true` hg
+  $ ln -s `which true 2>/dev/null` hg
   $ "$PYTHON" $TESTDIR/run-tests.py --with-hg=./hg
   warning: --with-hg should specify an hg script, not: true
   running 0 tests using 0 parallel processes