t5541: become resilient to GETTEXT_POISON
Use test_i18n* functions for testing text already marked for translation. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Jun 30, 2016 at 16:49 UTC
415c7dd026e4649bea48c35ccbe29d2fa8b69be5
1 file changed
+6
-6
t/t5541-http-push-smart.sh
+6
-6
@@ -119,7 +119,7 @@ test_expect_success 'rejected update prints status' '
119
git commit -m dev2 &&
120
test_must_fail git push origin dev2 2>act &&
121
sed -e "/^remote: /s/ *$//" <act >cmp &&
122
- test_cmp exp cmp
122
+ test_i18ncmp exp cmp
123
'
124
rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
125
@@ -219,7 +219,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' '
219
cd "$ROOT_PATH"/test_repo_clone &&
220
test_commit noisy &&
221
test_terminal git push >output 2>&1 &&
222
- grep "^Writing objects" output
222
+ test_i18ngrep "^Writing objects" output
223
'
224
225
test_expect_success TTY 'push --quiet silences status and progress' '
@@ -233,16 +233,16 @@ test_expect_success TTY 'push --no-progress silences progress but not status' '
233
cd "$ROOT_PATH"/test_repo_clone &&
234
test_commit no-progress &&
235
test_terminal git push --no-progress >output 2>&1 &&
236
- grep "^To http" output &&
237
- ! grep "^Writing objects"
236
+ test_i18ngrep "^To http" output &&
237
+ test_i18ngrep ! "^Writing objects"
238
'
239
240
test_expect_success 'push --progress shows progress to non-tty' '
241
cd "$ROOT_PATH"/test_repo_clone &&
242
test_commit progress &&
243
git push --progress >output 2>&1 &&
244
- grep "^To http" output &&
245
- grep "^Writing objects" output
244
+ test_i18ngrep "^To http" output &&
245
+ test_i18ngrep "^Writing objects" output
246
'
247
248
test_expect_success 'http push gives sane defaults to reflog' '