diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-31 08:23:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 11:13:44 +0300 |
| commit | 6789275d3780bcb950e6be8557aeedf160d4ad6d (patch) | |
| tree | 24c1fcc6ee63c63284e507b05e3332eb6f6d5537 /t/t5570-git-daemon.sh | |
| parent | 2e87fca189e613912b085c5140312b1f4b3f2977 (diff) | |
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>
Diffstat (limited to 't/t5570-git-daemon.sh')
| -rwxr-xr-x | t/t5570-git-daemon.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index 1131503b76..f9a9bf9503 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -10,9 +10,9 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME start_git_daemon check_verbose_connect () { - test_i18ngrep -F "Looking up 127.0.0.1 ..." stderr && - test_i18ngrep -F "Connecting to 127.0.0.1 (port " stderr && - test_i18ngrep -F "done." stderr + test_grep -F "Looking up 127.0.0.1 ..." stderr && + test_grep -F "Connecting to 127.0.0.1 (port " stderr && + test_grep -F "done." stderr } test_expect_success 'setup repository' ' @@ -108,7 +108,7 @@ test_expect_success 'fetch notices corrupt idx' ' test_expect_success 'client refuses to ask for repo with newline' ' test_must_fail git clone "$GIT_DAEMON_URL/repo$LF.git" dst 2>stderr && - test_i18ngrep newline.is.forbidden stderr + test_grep newline.is.forbidden stderr ' test_remote_error() @@ -148,7 +148,7 @@ test_remote_error() fi test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output && - test_i18ngrep "fatal: remote error: $msg: /$repo" output && + test_grep "fatal: remote error: $msg: /$repo" output && ret=$? chmod +x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" (exit $ret) |