Skip to content

Commit

Permalink
i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Apr 13, 2011
1 parent f2c8c80 commit fff1bb3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions t/t3203-branch-output.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ cat >expect <<'EOF'
branch-two
master
EOF
test_expect_success C_LOCALE_OUTPUT 'git branch shows detached HEAD properly' '
test_expect_success 'git branch shows detached HEAD properly' '
git checkout HEAD^0 &&
git branch >actual &&
test_cmp expect actual
test_i18ncmp expect actual
'

test_done
4 changes: 2 additions & 2 deletions t/t3501-revert-cherry-pick.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ test_expect_success 'cherry-pick on stat-dirty working tree' '
)
'

test_expect_success C_LOCALE_OUTPUT 'revert forbidden on dirty working tree' '
test_expect_success 'revert forbidden on dirty working tree' '
echo content >extra_file &&
git add extra_file &&
test_must_fail git revert HEAD 2>errors &&
grep "Your local changes would be overwritten by " errors
test_i18ngrep "Your local changes would be overwritten by " errors
'

Expand Down
4 changes: 2 additions & 2 deletions t/t3507-cherry-pick-conflict.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
test "$head" = "$newhead"
'

test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
test_expect_success 'advice from failed cherry-pick' "
pristine_detach initial &&
picked=\$(git rev-parse --short picked) &&
Expand All @@ -56,7 +56,7 @@ test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
EOF
test_must_fail git cherry-pick picked 2>actual &&
test_cmp expected actual
test_i18ncmp expected actual
"

test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
Expand Down

0 comments on commit fff1bb3

Please sign in to comment.