mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
t: run t5551 tests with both HTTP and HTTP/2
We have occasionally seen bugs that affect Git running only against an HTTP/2 web server, not an HTTP one. For instance,b66c77a64e
(http: match headers case-insensitively when redacting, 2021-09-22). But since we have no test coverage using HTTP/2, we only uncover these bugs in the wild. That commit gives a recipe for converting our Apache setup to support HTTP/2, but: - it's not necessarily portable - we don't want to just test HTTP/2; we really want to do a variety of basic tests for _both_ protocols This patch handles both problems by running a duplicate of t5551 (labeled as t5559 here) with an alternate-universe setup that enables HTTP/2. So we'll continue to run t5551 as before, but run the same battery of tests again with HTTP/2. If HTTP/2 isn't supported on a given platform, then t5559 should bail during the webserver setup, and gracefully skip all tests (unless GIT_TEST_HTTPD has been changed from "auto" to "yes", where the point is to complain when webserver setup fails). In theory other http-related test scripts could benefit from the same duplication, but doing t5551 should give us a reasonable check of basic functionality, and would have caught both bugs we've seen in the wild with HTTP/2. A few notes on the implementation: - a script enables the server side config by calling enable_http2 before starting the webserver. This avoids even trying to load any HTTP/2 config for t5551 (which is what lets it keep working with regular HTTP even on systems that don't support it). This also sets a prereq which can be used by individual tests. - As discussed inb66c77a64e
, the http2 module isn't compatible with the "prefork" mpm, so we need to pick something else. I chose "event" here, which works on my Debian system, but it's possible there are platforms which would prefer something else. We can adjust that later if somebody finds such a platform. - The test "large fetch-pack requests can be sent using chunked encoding" makes sure we use a chunked transfer-encoding by looking for that header in the trace. But since HTTP/2 has its own streaming mechanisms, we won't find such a header. We could skip the test entirely by marking it with !HTTP2. But there's some value in making sure that the fetch itself succeeded. So instead, we'll confirm that either we're using HTTP2 _or_ we saw the expected chunked header. - the redaction tests fail under HTTP/2 with recent versions of curl. This is a bug! I've marked them with !HTTP2 here to skip them under t5559 for the moment. Using test_expect_failure would be more appropriate, but would require a bunch of boilerplate. Since we'll be fixing them momentarily, let's just skip them for now to keep the test suite bisectable, and we can re-enable them in the commit that fixes the bug. - one alternative layout would be to push most of t5551 into a lib-t5551.sh script, then source it from both t5551 and t5559. Keeping t5551 intact seemed a little simpler, as its one less level of indirection for people fixing bugs/regressions in the non-HTTP/2 tests. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Taylor Blau <me@ttaylorr.com>
This commit is contained in:
parent
319605f8f0
commit
73c49a4474
|
@ -174,6 +174,11 @@ prepare_httpd() {
|
|||
fi
|
||||
}
|
||||
|
||||
enable_http2 () {
|
||||
HTTPD_PARA="$HTTPD_PARA -DHTTP2"
|
||||
test_set_prereq HTTP2
|
||||
}
|
||||
|
||||
start_httpd() {
|
||||
prepare_httpd >&3 2>&4
|
||||
|
||||
|
|
|
@ -29,6 +29,11 @@ ErrorLog error.log
|
|||
LoadModule setenvif_module modules/mod_setenvif.so
|
||||
</IfModule>
|
||||
|
||||
<IfDefine HTTP2>
|
||||
LoadModule http2_module modules/mod_http2.so
|
||||
Protocols h2c
|
||||
</IfDefine>
|
||||
|
||||
<IfVersion < 2.4>
|
||||
LockFile accept.lock
|
||||
</IfVersion>
|
||||
|
@ -64,12 +69,20 @@ LockFile accept.lock
|
|||
<IfModule !mod_access_compat.c>
|
||||
LoadModule access_compat_module modules/mod_access_compat.so
|
||||
</IfModule>
|
||||
<IfModule !mod_mpm_prefork.c>
|
||||
LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
|
||||
</IfModule>
|
||||
<IfModule !mod_unixd.c>
|
||||
LoadModule unixd_module modules/mod_unixd.so
|
||||
</IfModule>
|
||||
|
||||
<IfDefine HTTP2>
|
||||
<IfModule !mod_mpm_event.c>
|
||||
LoadModule mpm_event_module modules/mod_mpm_event.so
|
||||
</IfModule>
|
||||
</IfDefine>
|
||||
<IfDefine !HTTP2>
|
||||
<IfModule !mod_mpm_prefork.c>
|
||||
LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
|
||||
</IfModule>
|
||||
</IfDefine>
|
||||
</IfVersion>
|
||||
|
||||
PassEnv GIT_VALGRIND
|
||||
|
|
|
@ -1,13 +1,19 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='test smart fetching over http via http-backend'
|
||||
: ${HTTP_PROTO:=HTTP}
|
||||
test_description="test smart fetching over http via http-backend ($HTTP_PROTO)"
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||
test "$HTTP_PROTO" = "HTTP/2" && enable_http2
|
||||
start_httpd
|
||||
|
||||
test_expect_success HTTP2 'enable client-side http/2' '
|
||||
git config --global http.version HTTP/2
|
||||
'
|
||||
|
||||
test_expect_success 'setup repository' '
|
||||
git config push.default matching &&
|
||||
echo content >file &&
|
||||
|
@ -194,7 +200,7 @@ test_expect_success 'redirects send auth to new location' '
|
|||
expect_askpass both user@host auth/smart/repo.git
|
||||
'
|
||||
|
||||
test_expect_success 'GIT_TRACE_CURL redacts auth details' '
|
||||
test_expect_success !HTTP2 'GIT_TRACE_CURL redacts auth details' '
|
||||
rm -rf redact-auth trace &&
|
||||
set_askpass user@host pass@host &&
|
||||
GIT_TRACE_CURL="$(pwd)/trace" git clone --bare "$HTTPD_URL/auth/smart/repo.git" redact-auth &&
|
||||
|
@ -206,7 +212,7 @@ test_expect_success 'GIT_TRACE_CURL redacts auth details' '
|
|||
grep -i "Authorization: Basic <redacted>" trace
|
||||
'
|
||||
|
||||
test_expect_success 'GIT_CURL_VERBOSE redacts auth details' '
|
||||
test_expect_success !HTTP2 'GIT_CURL_VERBOSE redacts auth details' '
|
||||
rm -rf redact-auth trace &&
|
||||
set_askpass user@host pass@host &&
|
||||
GIT_CURL_VERBOSE=1 git clone --bare "$HTTPD_URL/auth/smart/repo.git" redact-auth 2>trace &&
|
||||
|
@ -347,7 +353,10 @@ test_expect_success CMDLINE_LIMIT \
|
|||
test_expect_success 'large fetch-pack requests can be sent using chunked encoding' '
|
||||
GIT_TRACE_CURL=true git -c http.postbuffer=65536 \
|
||||
clone --bare "$HTTPD_URL/smart/repo.git" split.git 2>err &&
|
||||
grep "^=> Send header: Transfer-Encoding: chunked" err
|
||||
{
|
||||
test_have_prereq HTTP2 ||
|
||||
grep "^=> Send header: Transfer-Encoding: chunked" err
|
||||
}
|
||||
'
|
||||
|
||||
test_expect_success 'test allowreachablesha1inwant' '
|
||||
|
@ -473,7 +482,7 @@ test_expect_success 'fetch by SHA-1 without tag following' '
|
|||
--no-tags origin $(cat bar_hash)
|
||||
'
|
||||
|
||||
test_expect_success 'cookies are redacted by default' '
|
||||
test_expect_success !HTTP2 'cookies are redacted by default' '
|
||||
rm -rf clone &&
|
||||
echo "Set-Cookie: Foo=1" >cookies &&
|
||||
echo "Set-Cookie: Bar=2" >>cookies &&
|
||||
|
|
4
t/t5559-http-fetch-smart-http2.sh
Executable file
4
t/t5559-http-fetch-smart-http2.sh
Executable file
|
@ -0,0 +1,4 @@
|
|||
#!/bin/sh
|
||||
|
||||
HTTP_PROTO=HTTP/2
|
||||
. ./t5551-http-fetch-smart.sh
|
Loading…
Reference in a new issue