Merge branch 'rj/test-i18ngrep'

gitster · gitster · commit d92a01566077 · 2018-03-14T12:01:03.000-07:00
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
@@ -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
@@ -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
 	)
 '
 

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,6 @@ setup_repository () {`
`18`	`18`	`)`
`19`	`19`	`}`
`20`	`20`
`21`		`-verify_stderr () {`
`22`		`- cat >expected &&`
`23`		`- # We're not interested in the error`
`24`		`- # "fatal: The remote end hung up unexpectedly":`
`25`		`- test_i18ngrep -E '^(fatal\|warning):' error \| grep -v 'hung up' >actual \| sort &&`
`26`		`- test_i18ncmp expected actual`
`27`		`-}`
`28`		`-`
`29`	`21`	`test_expect_success 'setup' '`
`30`	`22`	`git commit --allow-empty -m "Initial" &&`
`31`	`23`	`git branch branch1 &&`
`@@ -48,9 +40,7 @@ test_expect_success 'fetch conflict: config vs. config' '`
`48`	`40`	`"+refs/heads/branch2:refs/remotes/origin/branch1" && (`
`49`	`41`	`cd ccc &&`
`50`	`42`	`test_must_fail git fetch origin 2>error &&`
`51`		`- verify_stderr <<-\EOF`
`52`		`- fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1`
`53`		`- EOF`
	`43`	`+ test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error`
`54`	`44`	`)`
`55`	`45`	`'`
`56`	`46`
`@@ -77,9 +67,7 @@ test_expect_success 'fetch conflict: arg vs. arg' '`
`77`	`67`	`test_must_fail git fetch origin \`
`78`	`68`	`refs/heads/:refs/remotes/origin/ \`
`79`	`69`	`refs/heads/branch2:refs/remotes/origin/branch1 2>error &&`
`80`		`- verify_stderr <<-\EOF`
`81`		`- fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1`
`82`		`- EOF`
	`70`	`+ test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error`
`83`	`71`	`)`
`84`	`72`	`'`
`85`	`73`
`@@ -90,10 +78,8 @@ test_expect_success 'fetch conflict: criss-cross args' '`
`90`	`78`	`git fetch origin \`
`91`	`79`	`refs/heads/branch1:refs/remotes/origin/branch2 \`
`92`	`80`	`refs/heads/branch2:refs/remotes/origin/branch1 2>error &&`
`93`		`- verify_stderr <<-\EOF`
`94`		`- warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2`
`95`		`- warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1`
`96`		`- EOF`
	`81`	`+ test_i18ngrep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&`
	`82`	`+ test_i18ngrep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error`
`97`	`83`	`)`
`98`	`84`	`'`
`99`	`85`