git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 07/20] t5551: stop forcing clone to run with v0 protocol

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 28, 2023, 23:39 UTC
Message-ID
<20230228233913.684853-7-gitster@pobox.com>
In-Reply-To
<20230228233913.684853-1-gitster@pobox.com>
From: Jeff King <peff@peff.net>

In the "clone http repository" test, we check the curl trace to make sure the expected requests were made. This whole script was marked to handle only the v0 protocol in d790ee1707 (tests: fix protocol version for overspecifications, 2019-02-25). That makes sense, since v2 requires an extra request, so tests as specific as this would fail unless modified.

Later, in preparation for v2 becoming the default, this was tweaked by 8a1b0978ab (test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate, 2019-12-23). There we run the trace check only if the user has explicitly asked to test protocol version 0. But it also forced the clone itself to run with the v0 protocol.

This makes the check for "can we expect a v0 trace" silly; it will always be v0. But much worse, it means that the clone we are testing is not like the one that normal users would run. They would use the defaults, which are now v2. And since this is supposed to be a basic check of clone-over-http, we should do the same.

Let's fix this by dropping the extra v0 override. The test still passes because the trace checking only kicks in if we asked to use v0 explicitly (this is the same as before; even though we were running a v0 clone, unless you specifically set GIT_TEST_PROTOCOL_VERSION=0, the trace check was always skipped).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t5551-http-fetch-smart.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 716c9dbb69..4191174584 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -55,7 +55,7 @@ test_expect_success 'clone http repository' '
 	< content-type: application/x-git-upload-pack-result
 	EOF
 
-	GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION=0 LANGUAGE="ko_KR.UTF-8" \
+	GIT_TRACE_CURL=true LANGUAGE="ko_KR.UTF-8" \
 		git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
 	test_cmp file clone/file &&
 	tr '\''\015'\'' Q <err |
-- 
2.40.0-rc0-32-ga0f05f6840
Previous: Junio C HamanoNext: Junio C Hamano
Message 7 of 10 in “t5541: run "used receive-pack service" test earlier”
  1. 01/20 t5541: run "used receive-pack service" test earlierJunio C Hamano, Feb 28, 2023
  2. 02/20 t5541: stop marking "used receive-pack service" test as v0 onlyJunio C Hamano, Feb 28, 2023
  3. 03/20 t5541: simplify and move "no empty path components" testJunio C Hamano, Feb 28, 2023
  4. 04/20 t5551: drop redundant grep for Accept-LanguageJunio C Hamano, Feb 28, 2023
  5. 05/20 t5551: lower-case headers in expected curl traceJunio C Hamano, Feb 28, 2023
  6. 06/20 t5551: handle HTTP/2 when checking curl traceJunio C Hamano, Feb 28, 2023
  7. 07/20 t5551: stop forcing clone to run with v0 protocolJunio C Hamano, Feb 28, 2023
  8. 08/20 t5551: handle v2 protocol when checking curl traceJunio C Hamano, Feb 28, 2023
  9. 09/20 t5551: handle v2 protocol in upload-pack service testJunio C Hamano, Feb 28, 2023
  10. Junio C HamanoFeb 28, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.