[PATCH] test-mq-header: don't fail with different patch(1)

[Maxim Dounin]

# HG changeset patch
# User Maxim Dounin <mdounin at mdounin.ru>
# Date 1199764581 -10800
# Node ID 5b9f4a203e542573d8f2cf7976e2a447d296cc4c
# Parent  3ef279074c77c3cf3f6b35f0f73dee2fdba5aa41
test-mq-header: don't fail with different patch(1)

At least under FreeBSD patch(1) won't fail on empty patch and will print
'Hmm...' warning instead. Sanitize output so tests won't fail unexpectedly.

diff -r 3ef279074c77 -r 5b9f4a203e54 tests/test-mq-header-date
--- a/tests/test-mq-header-date	Sun Jan 06 15:40:32 2008 +0100
+++ b/tests/test-mq-header-date	Tue Jan 08 06:56:21 2008 +0300
@@ -103,8 +103,7 @@ hg qpop
 hg qpop
 echo "# HG changeset patch" >>.hg/patches/5.patch
 echo "# Date 10 0" >>.hg/patches/5.patch
-# Drop patch specific error line
-hg qpush 2>&1 | grep -v garbage
+hg qpush 2>&1 | grep 'Now at'
 catlogd 5
 
 echo ==== hg qref
diff -r 3ef279074c77 -r 5b9f4a203e54 tests/test-mq-header-date.out
--- a/tests/test-mq-header-date.out	Sun Jan 06 15:40:32 2008 +0100
+++ b/tests/test-mq-header-date.out	Tue Jan 08 06:56:21 2008 +0300
@@ -129,9 +129,6 @@ Now at: 3.patch
 Now at: 3.patch
 ==== qnew with HG header
 Now at: 3.patch
-applying 5.patch
-patch failed, unable to continue (try -v)
-patch 5.patch is empty
 Now at: 5.patch
 # HG changeset patch
 # Date 10 0
diff -r 3ef279074c77 -r 5b9f4a203e54 tests/test-mq-header-from
--- a/tests/test-mq-header-from	Sun Jan 06 15:40:32 2008 +0100
+++ b/tests/test-mq-header-from	Tue Jan 08 06:56:21 2008 +0300
@@ -83,8 +83,7 @@ hg qpop
 hg qpop
 echo "# HG changeset patch" >>.hg/patches/5.patch
 echo "# User johndoe" >>.hg/patches/5.patch
-# Drop patch specific error line
-hg qpush 2>&1 | grep -v garbage
+hg qpush 2>&1 | grep 'Now at'
 catlog 5
 
 echo ==== hg qref
diff -r 3ef279074c77 -r 5b9f4a203e54 tests/test-mq-header-from.out
--- a/tests/test-mq-header-from.out	Sun Jan 06 15:40:32 2008 +0100
+++ b/tests/test-mq-header-from.out	Tue Jan 08 06:56:21 2008 +0300
@@ -131,9 +131,6 @@ 0: [mq]: 1.patch - mary
 0: [mq]: 1.patch - mary
 ==== qnew with HG header
 Now at: 4.patch
-applying 5.patch
-patch failed, unable to continue (try -v)
-patch 5.patch is empty
 Now at: 5.patch
 # HG changeset patch
 # User johndoe