Fix tests under GETTEXT_POISON on git-remote

jiangxin · gitster · commit f7dc6a96435e · 2012-08-27T09:26:30.000-07:00
Use the i18n-specific test functions in test scripts for git-remote.
This issue was was introduced in v1.7.10-233-gbb16d5:

    bb16d5 i18n: remote: mark strings for translation

and been broken under GETTEXT_POISON=YesPlease since.

Signed-off-by: Jiang Xin &lt;worldhello.net@gmail.com&gt;
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
@@ -52,7 +52,7 @@ test_expect_success setup '
 
 '
 
-test_expect_success 'remote information for the origin' '
+test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
 (
 	cd test &&
 	tokens_match origin "$(git remote)" &&
@@ -66,8 +66,6 @@ test_expect_success 'add another remote' '
 	cd test &&
 	git remote add -f second ../two &&
 	tokens_match "origin second" "$(git remote)" &&
-	check_remote_track origin master side &&
-	check_remote_track second master side another &&
 	check_tracking_branch second master side another &&
 	git for-each-ref "--format=%(refname)" refs/remotes |
 	sed -e "/^refs\/remotes\/origin\//d" \
@@ -77,6 +75,14 @@ test_expect_success 'add another remote' '
 )
 '
 
+test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '
+(
+	cd test &&
+	check_remote_track origin master side &&
+	check_remote_track second master side another
+)
+'
+
 test_expect_success 'remote forces tracking branches' '
 (
 	cd test &&
@@ -95,7 +101,7 @@ test_expect_success 'remove remote' '
 )
 '
 
-test_expect_success 'remove remote' '
+test_expect_success C_LOCALE_OUTPUT 'remove remote' '
 (
 	cd test &&
 	tokens_match origin "$(git remote)" &&
@@ -131,8 +137,8 @@ EOF
 	git remote rm oops 2>actual2 &&
 	git branch -d foobranch &&
 	git tag -d footag &&
-	test_cmp expect1 actual1 &&
-	test_cmp expect2 actual2
+	test_i18ncmp expect1 actual1 &&
+	test_i18ncmp expect2 actual2
 )
 '
 
@@ -192,7 +198,7 @@ test_expect_success 'show' '
 	 git config --add remote.two.push refs/heads/master:refs/heads/another &&
 	 git remote show origin two > output &&
 	 git branch -d rebase octopus &&
-	 test_cmp expect output)
+	 test_i18ncmp expect output)
 '
 
 cat > test/expect << EOF
@@ -217,7 +223,7 @@ test_expect_success 'show -n' '
 	 cd test &&
 	 git remote show -n origin > output &&
 	 mv ../one.unreachable ../one &&
-	 test_cmp expect output)
+	 test_i18ncmp expect output)
 '
 
 test_expect_success 'prune' '
@@ -255,7 +261,7 @@ EOF
 test_expect_success 'set-head --auto fails w/multiple HEADs' '
 	(cd test &&
 	 test_must_fail git remote set-head --auto two >output 2>&1 &&
-	test_cmp expect output)
+	test_i18ncmp expect output)
 '
 
 cat >test/expect <<EOF
@@ -285,7 +291,7 @@ test_expect_success 'prune --dry-run' '
 	 test_must_fail git rev-parse refs/remotes/origin/side &&
 	(cd ../one &&
 	 git branch -m side side2) &&
-	 test_cmp expect output)
+	 test_i18ncmp expect output)
 '
 
 test_expect_success 'add --mirror && prune' '
@@ -705,7 +711,7 @@ test_expect_success 'remote prune to cause a dangling symref' '
 		cd seven &&
 		git remote prune origin
 	) >err 2>&1 &&
-	grep "has become dangling" err &&
+	test_i18ngrep "has become dangling" err &&
 
 	: And the dangling symref will not cause other annoying errors &&
 	(

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ test_expect_success setup '`
`52`	`52`
`53`	`53`	`'`
`54`	`54`
`55`		`-test_expect_success 'remote information for the origin' '`
	`55`	`+test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '`
`56`	`56`	`(`
`57`	`57`	`cd test &&`
`58`	`58`	`tokens_match origin "$(git remote)" &&`
`@@ -66,8 +66,6 @@ test_expect_success 'add another remote' '`
`66`	`66`	`cd test &&`
`67`	`67`	`git remote add -f second ../two &&`
`68`	`68`	`tokens_match "origin second" "$(git remote)" &&`
`69`		`- check_remote_track origin master side &&`
`70`		`- check_remote_track second master side another &&`
`71`	`69`	`check_tracking_branch second master side another &&`
`72`	`70`	`git for-each-ref "--format=%(refname)" refs/remotes \|`
`73`	`71`	`sed -e "/^refs\/remotes\/origin\//d" \`
`@@ -77,6 +75,14 @@ test_expect_success 'add another remote' '`
`77`	`75`	`)`
`78`	`76`	`'`
`79`	`77`
	`78`	`+test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '`
	`79`	`+(`
	`80`	`+ cd test &&`
	`81`	`+ check_remote_track origin master side &&`
	`82`	`+ check_remote_track second master side another`
	`83`	`+)`
	`84`	`+'`
	`85`	`+`
`80`	`86`	`test_expect_success 'remote forces tracking branches' '`
`81`	`87`	`(`
`82`	`88`	`cd test &&`
`@@ -95,7 +101,7 @@ test_expect_success 'remove remote' '`
`95`	`101`	`)`
`96`	`102`	`'`
`97`	`103`
`98`		`-test_expect_success 'remove remote' '`
	`104`	`+test_expect_success C_LOCALE_OUTPUT 'remove remote' '`
`99`	`105`	`(`
`100`	`106`	`cd test &&`
`101`	`107`	`tokens_match origin "$(git remote)" &&`
`@@ -131,8 +137,8 @@ EOF`
`131`	`137`	`git remote rm oops 2>actual2 &&`
`132`	`138`	`git branch -d foobranch &&`
`133`	`139`	`git tag -d footag &&`
`134`		`- test_cmp expect1 actual1 &&`
`135`		`- test_cmp expect2 actual2`
	`140`	`+ test_i18ncmp expect1 actual1 &&`
	`141`	`+ test_i18ncmp expect2 actual2`
`136`	`142`	`)`
`137`	`143`	`'`
`138`	`144`
`@@ -192,7 +198,7 @@ test_expect_success 'show' '`
`192`	`198`	`git config --add remote.two.push refs/heads/master:refs/heads/another &&`
`193`	`199`	`git remote show origin two > output &&`
`194`	`200`	`git branch -d rebase octopus &&`
`195`		`- test_cmp expect output)`
	`201`	`+ test_i18ncmp expect output)`
`196`	`202`	`'`
`197`	`203`
`198`	`204`	`cat > test/expect << EOF`
`@@ -217,7 +223,7 @@ test_expect_success 'show -n' '`
`217`	`223`	`cd test &&`
`218`	`224`	`git remote show -n origin > output &&`
`219`	`225`	`mv ../one.unreachable ../one &&`
`220`		`- test_cmp expect output)`
	`226`	`+ test_i18ncmp expect output)`
`221`	`227`	`'`
`222`	`228`
`223`	`229`	`test_expect_success 'prune' '`
`@@ -255,7 +261,7 @@ EOF`
`255`	`261`	`test_expect_success 'set-head --auto fails w/multiple HEADs' '`
`256`	`262`	`(cd test &&`
`257`	`263`	`test_must_fail git remote set-head --auto two >output 2>&1 &&`
`258`		`- test_cmp expect output)`
	`264`	`+ test_i18ncmp expect output)`
`259`	`265`	`'`
`260`	`266`
`261`	`267`	`cat >test/expect <<EOF`
`@@ -285,7 +291,7 @@ test_expect_success 'prune --dry-run' '`
`285`	`291`	`test_must_fail git rev-parse refs/remotes/origin/side &&`
`286`	`292`	`(cd ../one &&`
`287`	`293`	`git branch -m side side2) &&`
`288`		`- test_cmp expect output)`
	`294`	`+ test_i18ncmp expect output)`
`289`	`295`	`'`
`290`	`296`
`291`	`297`	`test_expect_success 'add --mirror && prune' '`
`@@ -705,7 +711,7 @@ test_expect_success 'remote prune to cause a dangling symref' '`
`705`	`711`	`cd seven &&`
`706`	`712`	`git remote prune origin`
`707`	`713`	`) >err 2>&1 &&`
`708`		`- grep "has become dangling" err &&`
	`714`	`+ test_i18ngrep "has become dangling" err &&`
`709`	`715`
`710`	`716`	`: And the dangling symref will not cause other annoying errors &&`
`711`	`717`	`(`