| Message ID | Y/dFWqzaCeCbmGUs@coredump.intra.peff.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a58f4d6328b71dbcaab517bf5b0b487be4029cf0 |
| Headers | show |
| Series | [01/16] t5541: run "used receive-pack service" test earlier | expand |
Jeff King <peff@peff.net> writes: > Commit b0c4adcdd7 (remote-curl: send Accept-Language header to server, > 2022-07-11) added tests to make sure the header is sent via HTTP. > However, it checks in two places: > > 1. In the expected trace output, we check verbatim for the header and > its value. > > 2. Afterwards, we grep for the header again in the trace file. > > This (2) is probably cargo-culted from the earlier grep for > Accept-Encoding. It is needed for the encoding because we smudge the > value of that header when doing the verbatim check; see 1a53e692af > (remote-curl: accept all encodings supported by curl, 2018-05-22). > > But we don't do so for the language header, so any problem that the > "grep" would catch in (2) would already have been caught by (1). Makes sense. > > Signed-off-by: Jeff King <peff@peff.net> > --- > t/t5551-http-fetch-smart.sh | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh > index 10b7e7cda2..29d489768e 100755 > --- a/t/t5551-http-fetch-smart.sh > +++ b/t/t5551-http-fetch-smart.sh > @@ -103,10 +103,7 @@ test_expect_success 'clone http repository' ' > test_cmp exp actual.smudged && > > grep "Accept-Encoding:.*gzip" actual >actual.gzip && > - test_line_count = 2 actual.gzip && > - > - grep "Accept-Language: ko-KR, *" actual >actual.language && > - test_line_count = 2 actual.language > + test_line_count = 2 actual.gzip > fi > '
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh index 10b7e7cda2..29d489768e 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -103,10 +103,7 @@ test_expect_success 'clone http repository' ' test_cmp exp actual.smudged && grep "Accept-Encoding:.*gzip" actual >actual.gzip && - test_line_count = 2 actual.gzip && - - grep "Accept-Language: ko-KR, *" actual >actual.language && - test_line_count = 2 actual.language + test_line_count = 2 actual.gzip fi '
Commit b0c4adcdd7 (remote-curl: send Accept-Language header to server, 2022-07-11) added tests to make sure the header is sent via HTTP. However, it checks in two places: 1. In the expected trace output, we check verbatim for the header and its value. 2. Afterwards, we grep for the header again in the trace file. This (2) is probably cargo-culted from the earlier grep for Accept-Encoding. It is needed for the encoding because we smudge the value of that header when doing the verbatim check; see 1a53e692af (remote-curl: accept all encodings supported by curl, 2018-05-22). But we don't do so for the language header, so any problem that the "grep" would catch in (2) would already have been caught by (1). Signed-off-by: Jeff King <peff@peff.net> --- t/t5551-http-fetch-smart.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)