Michael Montalbo
47f79f6198
Replace bare grep with test_grep in test assertions across the
suite, including sourced test helpers (lib-*.sh, *-tests.sh).
test_grep prints the contents of the file being searched on
failure, making debugging easier than a bare grep which fails
silently.
Only assertion-style greps are converted: grep used as a filter
in pipelines, command substitutions, conditionals, or with
redirected I/O is left as-is with a "# lint-ok" annotation.
Existing '! test_grep' calls are rewritten to 'test_grep !' so
that the diagnostic output is preserved on failure.
test_grep requires the file it reads to exist, so '! grep'
assertions that inspect a file whose presence is conditional need
care. In t5537 the '.git/shallow' file is still present after the
repack (the client remains shallow), so the assertion is
converted like any other. In t1400 the '.git/packed-refs' file
exists only with the files backend, so its check is guarded with a
REFFILES prerequisite; the backend-agnostic 'git show-ref' check
that follows still runs under every backend. In t7450 'git~2' is
the NTFS 8.3 short name of a '..git' file and only exists
when 8.3 short-name generation is enabled, so its check is guarded
with a 'test -f' on the path and uses test_grep inside the guard,
the same shape as t1400 (a plain test_grep would BUG when the
short name is absent).
The conversion was generated using a grep-assertion linter
(greplint.pl, added in the following commit) to identify bare
grep calls at command position. To reproduce, from the t/
directory:
# Step 1: annotate the two data-filter greps (grep produces
# data, not a verdict) so the linter skips them.
sed -i '/grep -vf before commits\.raw/s/$/ # lint-ok: data filter/' \
t5326-multi-pack-bitmaps.sh
sed -i '/grep -E "^\[0-9a-f\].*|| :/s/$/ # lint-ok: data filter/' \
t5702-protocol-v2.sh
# Step 1b: two '! grep' assertions need more than a mechanical
# conversion; handle them by hand before the linter-driven steps
# below so it leaves them alone.
#
# t1400: '.git/packed-refs' is absent under reftable, so guard the
# check with REFFILES (a plain test_grep would BUG on the missing
# file):
#
# git update-ref -d HEAD $B &&
# - ! grep "$m" .git/packed-refs &&
# + if test_have_prereq REFFILES
# + then
# + test_grep ! "$m" .git/packed-refs
# + fi &&
# test_must_fail git show-ref --verify -q $m
#
# t7450: git~2 is an NTFS 8.3 short name that exists only when
# short-name generation is enabled, so guard the check on its
# presence with 'test -f' and note in a comment why the path can
# be absent (a plain test_grep would BUG when it is):
#
# - ! grep gitdir squatting-clone/d/a/git~2
# + if test -f squatting-clone/d/a/git~2
# + then
# + test_grep ! gitdir squatting-clone/d/a/git~2
# + fi
# Step 2: reorder pre-existing '! test_grep' to 'test_grep !'
# (must come before steps 3-4 so greplint does not see them)
sed -i 's/! test_grep/test_grep !/' t0031-lockfile-pid.sh
sed -i 's/! test_grep/test_grep !/' t5300-pack-object.sh
sed -i 's/! test_grep/test_grep !/' t5319-multi-pack-index.sh
# Step 3: convert '! grep' -> 'test_grep !'
perl greplint.pl *.sh 2>&1 | cut -d: -f1,2 |
while IFS=: read f l; do
sed -i "${l}s/! *grep/test_grep !/" "$f"
done
# Step 4: convert remaining 'grep' -> 'test_grep'
perl greplint.pl *.sh 2>&1 | cut -d: -f1,2 |
while IFS=: read f l; do
sed -i "${l}s/grep/test_grep/" "$f"
done
To verify, run: make -C t test-greplint
Signed-off-by: Michael Montalbo <mmontalbo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
112 lines
3.4 KiB
Bash
Executable File
112 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description="test fetching through http proxy"
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
|
|
|
LIB_HTTPD_PROXY=1
|
|
start_httpd
|
|
|
|
test_expect_success 'setup repository' '
|
|
test_commit foo &&
|
|
git init --bare "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
git push --mirror "$HTTPD_DOCUMENT_ROOT_PATH/repo.git"
|
|
'
|
|
|
|
setup_askpass_helper
|
|
|
|
# sanity check that our test setup is correctly using proxy
|
|
test_expect_success 'proxy requires password' '
|
|
test_config_global http.proxy $HTTPD_DEST &&
|
|
test_must_fail git clone $HTTPD_URL/smart/repo.git 2>err &&
|
|
test_grep "error.*407" err
|
|
'
|
|
|
|
test_expect_success 'clone through proxy with auth' '
|
|
test_when_finished "rm -rf clone" &&
|
|
test_config_global http.proxy http://proxuser:proxpass@$HTTPD_DEST &&
|
|
GIT_TRACE_CURL=$PWD/trace git clone $HTTPD_URL/smart/repo.git clone &&
|
|
test_grep -i "Proxy-Authorization: Basic <redacted>" trace
|
|
'
|
|
|
|
test_expect_success 'clone can prompt for proxy password' '
|
|
test_when_finished "rm -rf clone" &&
|
|
test_config_global http.proxy http://proxuser@$HTTPD_DEST &&
|
|
set_askpass nobody proxpass &&
|
|
GIT_TRACE_CURL=$PWD/trace git clone $HTTPD_URL/smart/repo.git clone &&
|
|
expect_askpass pass proxuser
|
|
'
|
|
|
|
start_socks() {
|
|
mkfifo socks_output &&
|
|
(
|
|
"$PERL_PATH" "$TEST_DIRECTORY/socks4-proxy.pl" "$1" >socks_output &
|
|
echo $! > "$TRASH_DIRECTORY/socks.pid"
|
|
) &&
|
|
read line <socks_output &&
|
|
test "$line" = ready
|
|
}
|
|
|
|
# The %30 tests that the correct amount of percent-encoding is applied to the
|
|
# proxy string passed to curl.
|
|
# Use a short path for the socket to avoid exceeding the 108-character
|
|
# Unix domain socket limit when the trash directory path is long.
|
|
SOCKS_TMPDIR=$(mktemp -d)
|
|
SOCKS_SOCK="$SOCKS_TMPDIR/%30.sock"
|
|
|
|
test_lazy_prereq SOCKS_PROXY '
|
|
test_have_prereq PERL &&
|
|
start_socks "$SOCKS_SOCK"
|
|
'
|
|
|
|
test_atexit '
|
|
test ! -e "$TRASH_DIRECTORY/socks.pid" ||
|
|
kill "$(cat "$TRASH_DIRECTORY/socks.pid")"
|
|
rm -rf "$SOCKS_TMPDIR"
|
|
'
|
|
|
|
# The below tests morally ought to be gated on a prerequisite that Git is
|
|
# linked with a libcurl that supports Unix socket paths for proxies (7.84 or
|
|
# later), but this is not easy to test right now. Instead, we || the tests with
|
|
# this function.
|
|
old_libcurl_error() {
|
|
grep -Fx "fatal: libcurl 7.84 or later is required to support paths in proxy URLs" "$1"
|
|
}
|
|
|
|
test_expect_success SOCKS_PROXY 'clone via Unix socket' '
|
|
test_when_finished "rm -rf clone" &&
|
|
socks_proxy_url="socks4://localhost$(echo "$SOCKS_SOCK" | sed "s/%/%25/g")" &&
|
|
test_config_global http.proxy "$socks_proxy_url" && {
|
|
{
|
|
GIT_TRACE_CURL=$PWD/trace \
|
|
GIT_TRACE_CURL_COMPONENTS=socks \
|
|
git clone "$HTTPD_URL/smart/repo.git" clone 2>err &&
|
|
test_grep -i "SOCKS4 request granted" trace
|
|
} ||
|
|
old_libcurl_error err
|
|
}
|
|
'
|
|
|
|
test_expect_success 'Unix socket requires socks*:' - <<\EOT
|
|
! git clone -c http.proxy=localhost/path https://example.com/repo.git 2>err && {
|
|
test_grep -Fx "fatal: Invalid proxy URL 'localhost/path': only SOCKS proxies support paths" err ||
|
|
old_libcurl_error err
|
|
}
|
|
EOT
|
|
|
|
test_expect_success 'Unix socket requires localhost' - <<\EOT
|
|
! git clone -c http.proxy=socks4://127.0.0.1/path https://example.com/repo.git 2>err && {
|
|
test_grep -Fx "fatal: Invalid proxy URL 'socks4://127.0.0.1/path': host must be localhost if a path is present" err ||
|
|
old_libcurl_error err
|
|
}
|
|
EOT
|
|
|
|
test_expect_success 'unknown proxy scheme is rejected' '
|
|
test_must_fail git clone -c http.proxy=htpp://127.0.0.1 \
|
|
https://example.com/repo.git 2>err &&
|
|
test_grep "unsupported proxy scheme '\''htpp'\''" err
|
|
'
|
|
|
|
test_done
|