summaryrefslogtreecommitdiff
path: root/t/t3320-notes-merge-worktrees.sh
diff options
context:
space:
mode:
authorVasco Almeida <vascomalmeida@sapo.pt>2016-06-17 20:21:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-17 22:45:48 (GMT)
commit1edbaac3bbe1a55cf3450ae7a350b50826d5d283 (patch)
tree8d96ba6ba90615e0c690b2e4cd4d9373ec66ee6f /t/t3320-notes-merge-worktrees.sh
parentab33a76ec5313b00d630a14d2a843cdb942ed2be (diff)
downloadgit-1edbaac3bbe1a55cf3450ae7a350b50826d5d283.zip
git-1edbaac3bbe1a55cf3450ae7a350b50826d5d283.tar.gz
git-1edbaac3bbe1a55cf3450ae7a350b50826d5d283.tar.bz2
tests: use test_i18n* functions to suppress false positives
The test functions test_i18ncmp and test_i18ngrep pretend success if run under GETTEXT_POISON. By using those functions to test output which is correctly marked as translatable, enables one to detect if the strings newly marked for translation are from plumbing output. If they are indeed from plumbing, the test would fail, and the string should be unmarked, since it is not seen by users. Thus, it is productive to not have false positives when running the test under GETTEXT_POISON. This commit replaces normal test functions by their i18n aware variants in use-cases know to be correctly marked for translation, suppressing false positives. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3320-notes-merge-worktrees.sh')
-rwxr-xr-xt/t3320-notes-merge-worktrees.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 1f71d58..522157b 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -52,7 +52,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' '
cd worktree &&
git config core.notesRef refs/notes/y &&
test_must_fail git notes merge z 2>err &&
- grep "A notes merge into refs/notes/y is already in-progress at" err
+ test_i18ngrep "A notes merge into refs/notes/y is already in-progress at" err
) &&
test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
'