mirror of
https://github.com/git/git.git
synced 2026-01-09 17:46:37 +00:00
tests: teach callers of test_i18ngrep to use test_grep
They are equivalents and the former still exists, so as long as the
only change this commit makes are to rewrite test_i18ngrep to
test_grep, there won't be any new bug, even if there still are
callers of test_i18ngrep remaining in the tree, or when merged to
other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'
and a good way to sanity check the result yourself is to run the
above in a checkout of c4603c1c (test framework: further deprecate
test_i18ngrep, 2023-10-31) and compare the resulting working tree
contents with the result of applying this patch to the same commit.
You'll see that test_i18ngrep in a few t/lib-*.sh files corrected,
in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@@ -371,7 +371,7 @@ test_expect_success $PREREQ,!AUTOIDENT 'broken implicit ident aborts send-email'
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
--to=to@example.com \
|
||||
$patches </dev/null 2>errors &&
|
||||
test_i18ngrep "tell me who you are" errors
|
||||
test_grep "tell me who you are" errors
|
||||
)
|
||||
'
|
||||
|
||||
@@ -2062,7 +2062,7 @@ test_expect_success $PREREQ 'aliases and sendemail.identity' '
|
||||
-c sendemail.aliasesfile=default-aliases \
|
||||
-c sendemail.cloud.aliasesfile=cloud-aliases \
|
||||
send-email -1 2>stderr &&
|
||||
test_i18ngrep "cloud-aliases" stderr
|
||||
test_grep "cloud-aliases" stderr
|
||||
'
|
||||
|
||||
test_sendmail_aliases () {
|
||||
@@ -2427,7 +2427,7 @@ test_expect_success $PREREQ 'invoke hook' '
|
||||
--to=nobody@example.com \
|
||||
--smtp-server="$(pwd)/../fake.sendmail" \
|
||||
../another.patch 2>err &&
|
||||
test_i18ngrep "rejected by sendemail-validate hook" err
|
||||
test_grep "rejected by sendemail-validate hook" err
|
||||
)
|
||||
'
|
||||
|
||||
@@ -2483,7 +2483,7 @@ test_expect_success $PREREQ 'test that sendmail config is rejected' '
|
||||
--to=nobody@example.com \
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
HEAD^ 2>err &&
|
||||
test_i18ngrep "found configuration options for '"'"sendmail"'"'" err
|
||||
test_grep "found configuration options for '"'"sendmail"'"'" err
|
||||
'
|
||||
|
||||
test_expect_success $PREREQ 'test that sendmail config rejection is specific' '
|
||||
|
||||
Reference in New Issue
Block a user