diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:04:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:04:02 +0900 |
| commit | a8e2394704d0543f4e1f1ac6ea532d098316d97e (patch) | |
| tree | 9120b53b6c93bb8db02997cb446a4311a7e21311 /t/t5570-git-daemon.sh | |
| parent | Merge branch 'la/strvec-header-fix' (diff) | |
| parent | tests: teach callers of test_i18ngrep to use test_grep (diff) | |
| download | git-a8e2394704d0543f4e1f1ac6ea532d098316d97e.tar.gz git-a8e2394704d0543f4e1f1ac6ea532d098316d97e.zip | |
Merge branch 'jc/test-i18ngrep'
Another step to deprecate test_i18ngrep.
* jc/test-i18ngrep:
tests: teach callers of test_i18ngrep to use test_grep
test framework: further deprecate test_i18ngrep
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) |