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

i18n: use test_i18ngrep in lib-httpd and t2019

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-04-12 16:12:47 -07:00
parent 127df8c6cf
commit d3bd0425b2
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/lib-httpd.sh
View File

@ -157,8 +157,7 @@ test_http_push_nonff() {
grep "^ ! \[rejected\][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" output grep "^ ! \[rejected\][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" output
' '
test_expect_success C_LOCALE_OUTPUT 'non-fast-forward push shows help message' ' test_expect_success 'non-fast-forward push shows help message' '
grep "To prevent you from losing history, non-fast-forward updates were rejected" \ test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" output
output
' '
} }

12
t/t2019-checkout-ambiguous-ref.sh
View File

@ -29,9 +29,9 @@ test_expect_success 'checkout chooses branch over tag' '
test_cmp expect file test_cmp expect file
' '
test_expect_success C_LOCALE_OUTPUT 'checkout reports switch to branch' ' test_expect_success 'checkout reports switch to branch' '
grep "Switched to branch" stderr && test_i18ngrep "Switched to branch" stderr &&
! grep "^HEAD is now at" stderr test_i18ngrep ! "^HEAD is now at" stderr
' '
test_expect_success 'checkout vague ref succeeds' ' test_expect_success 'checkout vague ref succeeds' '
@ -51,9 +51,9 @@ test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' '
test_cmp expect file test_cmp expect file
' '
test_expect_success VAGUENESS_SUCCESS,C_LOCALE_OUTPUT 'checkout reports switch to branch' ' test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' '
grep "Switched to branch" stderr && test_i18ngrep "Switched to branch" stderr &&
! grep "^HEAD is now at" stderr test_i18ngrep ! "^HEAD is now at" stderr
' '
test_done test_done