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>
This commit is contained in:
parent
b18237f4e3
commit
415c7dd026
@ -119,7 +119,7 @@ test_expect_success 'rejected update prints status' '
|
||||
git commit -m dev2 &&
|
||||
test_must_fail git push origin dev2 2>act &&
|
||||
sed -e "/^remote: /s/ *$//" <act >cmp &&
|
||||
test_cmp exp cmp
|
||||
test_i18ncmp exp cmp
|
||||
'
|
||||
rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
|
||||
|
||||
@ -219,7 +219,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' '
|
||||
cd "$ROOT_PATH"/test_repo_clone &&
|
||||
test_commit noisy &&
|
||||
test_terminal git push >output 2>&1 &&
|
||||
grep "^Writing objects" output
|
||||
test_i18ngrep "^Writing objects" output
|
||||
'
|
||||
|
||||
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' '
|
||||
cd "$ROOT_PATH"/test_repo_clone &&
|
||||
test_commit no-progress &&
|
||||
test_terminal git push --no-progress >output 2>&1 &&
|
||||
grep "^To http" output &&
|
||||
! grep "^Writing objects"
|
||||
test_i18ngrep "^To http" output &&
|
||||
test_i18ngrep ! "^Writing objects"
|
||||
'
|
||||
|
||||
test_expect_success 'push --progress shows progress to non-tty' '
|
||||
cd "$ROOT_PATH"/test_repo_clone &&
|
||||
test_commit progress &&
|
||||
git push --progress >output 2>&1 &&
|
||||
grep "^To http" output &&
|
||||
grep "^Writing objects" output
|
||||
test_i18ngrep "^To http" output &&
|
||||
test_i18ngrep "^Writing objects" output
|
||||
'
|
||||
|
||||
test_expect_success 'http push gives sane defaults to reflog' '
|
||||
|
Loading…
Reference in New Issue
Block a user