tests: unpack-trees: update to use test_i18n* functions
Use functions test_i18ncmp and test_i18ngrep to successfully pass tests running under GETTEXT_POISON. The output strings compared to in these test were marked for translation in ed47fdf ("i18n: unpack-trees: mark strings for translation", 2016-04-09) and later improved in 2e3926b ("i18n: unpack-trees: avoid substituting only a verb in sentences", 2016-05-12). Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Jun 17, 2016 at 20:21 UTC
e5c1272c07eb5b70e2f785ff715a800f0e3f456e
4 files changed
+6
-6
t/t1011-read-tree-sparse-checkout.sh
+1
-1
@@ -247,7 +247,7 @@ error: The following untracked working tree files would be overwritten by checko
247
Please move or remove them before you can switch branches.
248
Aborting
249
EOF
250
- test_cmp expected actual
250
+ test_i18ncmp expected actual
251
'
252
253
test_expect_success 'checkout without --ignore-skip-worktree-bits' '
t/t3400-rebase.sh
+2
-2
@@ -136,8 +136,8 @@ test_expect_success 'setup: recover' '
136
test_expect_success 'Show verbose error when HEAD could not be detached' '
137
>B &&
138
test_must_fail git rebase topic 2>output.err >output.out &&
139
- grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
140
- grep B output.err
139
+ test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
140
+ test_i18ngrep B output.err
141
'
142
rm -f B
143
t/t3404-rebase-interactive.sh
+2
-2
@@ -219,9 +219,9 @@ test_expect_success 'abort with error when new base cannot be checked out' '
219
git commit -m "remove file in base" &&
220
set_fake_editor &&
221
test_must_fail git rebase -i master > output 2>&1 &&
222
- grep "The following untracked working tree files would be overwritten by checkout:" \
222
+ test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
223
output &&
224
- grep "file1" output &&
224
+ test_i18ngrep "file1" output &&
225
test_path_is_missing .git/rebase-merge &&
226
git reset --hard HEAD^
227
'
t/t7607-merge-overwrite.sh
+1
-1
@@ -125,7 +125,7 @@ test_expect_success 'will not overwrite untracked file in leading path' '
125
cp important sub &&
126
cp important sub2 &&
127
test_must_fail git merge sub 2>out &&
128
- test_cmp out expect &&
128
+ test_i18ncmp out expect &&
129
test_path_is_missing .git/MERGE_HEAD &&
130
test_cmp important sub &&
131
test_cmp important sub2 &&