[PATCH 1/3] t3404: become resilient to GETTEXT_POISON

Subsystems: the rest

STALE3662d

4 messages, 2 authors, 2016-08-17 · open the first message on its own page

[PATCH 1/3] t3404: become resilient to GETTEXT_POISON

From: Vasco Almeida <hidden>
Date: 2016-08-12 12:00:20

The concerned test greps the output of exit_with_patch() in
git-rebase--interactive.sh script.

Signed-off-by: Vasco Almeida <redacted>
---
 t/t3404-rebase-interactive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 197914b..597e94e 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh

@@ -1286,7 +1286,7 @@ test_expect_success 'rebase -i --gpg-sign=<key-id>' '
 	set_fake_editor &&
 	FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
 		>out 2>err &&
-	grep "$SQ-S\"S I Gner\"$SQ" err
+	test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
 '
 
 test_done

-- 
2.7.4

[PATCH 2/3] t5520: become resilient to GETTEXT_POISON

From: Vasco Almeida <hidden>
Date: 2016-08-12 12:00:23

Use test_i18ngrep function instead of grep for grepping strings.

Signed-off-by: Vasco Almeida <redacted>
---
 t/t5520-pull.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 6ad37b5..5518445 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh

@@ -270,7 +270,7 @@ test_expect_success '--rebase with conflicts shows advice' '
 	test_tick &&
 	git commit -m "Create conflict" seq.txt &&
 	test_must_fail git pull --rebase . seq 2>err >out &&
-	grep "When you have resolved this problem" out
+	test_i18ngrep "When you have resolved this problem" out
 '
 
 test_expect_success 'failed --rebase shows advice' '

@@ -284,7 +284,7 @@ test_expect_success 'failed --rebase shows advice' '
 	git checkout -f -b fails-to-rebase HEAD^ &&
 	test_commit v2-without-cr file "2" file2-lf &&
 	test_must_fail git pull --rebase . diverging 2>err >out &&
-	grep "When you have resolved this problem" out
+	test_i18ngrep "When you have resolved this problem" out
 '
 
 test_expect_success '--rebase fails with multiple branches' '

-- 
2.7.4

[PATCH 3/3] t7411: become resilient to GETTEXT_POISON

From: Vasco Almeida <hidden>
Date: 2016-08-12 12:00:32

The concerned test greps the error message in git_parse_source() which
contains "bad config line %d in submodule-blob %s".

Signed-off-by: Vasco Almeida <redacted>
---
 t/t7411-submodule-config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index 400e2b1..47562ce 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh

@@ -89,7 +89,7 @@ test_expect_success 'error message contains blob reference' '
 			HEAD b \
 			HEAD submodule \
 				2>actual_err &&
-		grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
+		test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
 	)
 '

-- 
2.7.4

Re: [PATCH 1/3] t3404: become resilient to GETTEXT_POISON

From: Johannes Schindelin <hidden>
Date: 2016-08-17 12:56:16

Hi Vasco,

On Fri, 12 Aug 2016, Vasco Almeida wrote:

The concerned test greps the output of exit_with_patch() in
git-rebase--interactive.sh script.

Signed-off-by: Vasco Almeida <redacted>

Thank you for keeping an eye out for these issues. I have to admit that I
am a bit confused when to use i18ngrep and when not, so it is good to know
that my mistakes won't survive for long!

Ciao,
Dscho

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help