undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5541: become resilient to GETTEXT_POISON

Browse Source 
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:
Vasco Almeida 2016-06-30 16:49:18 +00:00 committed by Junio C Hamano
parent b18237f4e3
commit 415c7dd026
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/t5541-http-push-smart.sh
View File

@ -119,7 +119,7 @@ test_expect_success 'rejected update prints status' '
git commit -m dev2 && git commit -m dev2 &&
test_must_fail git push origin dev2 2>act && test_must_fail git push origin dev2 2>act &&
sed -e "/^remote: /s/ *$//" <act >cmp && 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" 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 && cd "$ROOT_PATH"/test_repo_clone &&
test_commit noisy && test_commit noisy &&
test_terminal git push >output 2>&1 && 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' ' 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 && cd "$ROOT_PATH"/test_repo_clone &&
test_commit no-progress && test_commit no-progress &&
test_terminal git push --no-progress >output 2>&1 && test_terminal git push --no-progress >output 2>&1 &&
grep "^To http" output && test_i18ngrep "^To http" output &&
! grep "^Writing objects" test_i18ngrep ! "^Writing objects"
' '
test_expect_success 'push --progress shows progress to non-tty' ' test_expect_success 'push --progress shows progress to non-tty' '
cd "$ROOT_PATH"/test_repo_clone && cd "$ROOT_PATH"/test_repo_clone &&
test_commit progress && test_commit progress &&
git push --progress >output 2>&1 && git push --progress >output 2>&1 &&
grep "^To http" output && test_i18ngrep "^To http" output &&
grep "^Writing objects" output test_i18ngrep "^Writing objects" output
' '
test_expect_success 'http push gives sane defaults to reflog' ' test_expect_success 'http push gives sane defaults to reflog' '