Merge branch 'rj/test-i18ngrep'

Test updates.

* rj/test-i18ngrep:
t5536: simplify checking of messages output to stderr
t4151: consolidate multiple calls to test_i18ngrep

diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 9473c2779ef0df109f6943a949583676ea5ceabf..16432781d2e0d52c33dfb1444fcce4459b417e8b 100755 (executable)
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -46,9 +46,8 @@ do
 
        test_expect_success "am$with3 --skip continue after failed am$with3" '
                test_must_fail git am$with3 --skip >output &&
-               test_i18ngrep "^Applying" output >output.applying &&
-               test_i18ngrep "^Applying: 6$" output.applying &&
-               test_i18ncmp file-2-expect file-2 &&
+               test_i18ngrep "^Applying: 6$" output &&
+               test_cmp file-2-expect file-2 &&
                test ! -f .git/MERGE_RR
        '
 

diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
index 644736b8a3b95c501bd8bb99850dd8de474b10d6..91f28c2f783df7391d22bd893e2488e56658515b 100755 (executable)
--- a/t/t5536-fetch-conflicts.sh
+++ b/t/t5536-fetch-conflicts.sh
@@ -18,14 +18,6 @@ setup_repository () {
        )
 }
 
-verify_stderr () {
-       cat >expected &&
-       # We're not interested in the error
-       # "fatal: The remote end hung up unexpectedly":
-       test_i18ngrep -E '^(fatal|warning):' error | grep -v 'hung up' >actual | sort &&
-       test_i18ncmp expected actual
-}
-
 test_expect_success 'setup' '
        git commit --allow-empty -m "Initial" &&
        git branch branch1 &&
@@ -48,9 +40,7 @@ test_expect_success 'fetch conflict: config vs. config' '
                "+refs/heads/branch2:refs/remotes/origin/branch1" && (
                cd ccc &&
                test_must_fail git fetch origin 2>error &&
-               verify_stderr <<-\EOF
-               fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
-               EOF
+               test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
        )
 '
 
@@ -77,9 +67,7 @@ test_expect_success 'fetch conflict: arg vs. arg' '
                test_must_fail git fetch origin \
                        refs/heads/*:refs/remotes/origin/* \
                        refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
-               verify_stderr <<-\EOF
-               fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
-               EOF
+               test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
        )
 '
 
@@ -90,10 +78,8 @@ test_expect_success 'fetch conflict: criss-cross args' '
                git fetch origin \
                        refs/heads/branch1:refs/remotes/origin/branch2 \
                        refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
-               verify_stderr <<-\EOF
-               warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2
-               warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1
-               EOF
+               test_i18ngrep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
+               test_i18ngrep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
        )
 '