t5551: lower-case headers in expected curl trace

There's a test in t5551 which checks the curl trace (after simplifying
it a bit). It doesn't work with HTTP/2, because in that case curl
outputs all of the headers in lower-case. Even though this test is run
with HTTP/2 by t5559, nobody has noticed because checking the trace only
happens if GIT_TEST_PROTOCOL_VERSION is manually set to "0".

Let's fix this by lower-casing all of the header names in the trace, and
then checking for those in our expected code (this is easier than making
HTTP/2 traces look like HTTP/1.1, since HTTP/1.1 uses title-casing).

Sadly, we can't quite do this in our existing sed script. This works if
you have GNU sed:

  s/^\\([><]\\) \\([A-Za-z0-9-]*:\\)/\1 \L\2\E/

but \L is a GNU-ism, and I don't think there's a portable solution. We
could just "tr A-Z a-z" on the way in, of course, but that makes the
non-header parts harder to read (e.g., lowercase "post" requests). But
to paraphrase Baron Munchausen, I have learned from experience that a
modicum of Perl can be most efficacious.

Note that this doesn't quite get the test passing with t5559; there are
more fixes needed on top.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 29d489768e1c6dacc519acf73e01d8c734e139c7..a81f852cbfe4fcd8fbe49bcd4c72486b7837354b 100755 (executable)
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -35,30 +35,35 @@ setup_askpass_helper
 test_expect_success 'clone http repository' '
        cat >exp <<-\EOF &&
        > GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1
-       > Accept: */*
-       > Accept-Encoding: ENCODINGS
-       > Accept-Language: ko-KR, *;q=0.9
-       > Pragma: no-cache
+       > accept: */*
+       > accept-encoding: ENCODINGS
+       > accept-language: ko-KR, *;q=0.9
+       > pragma: no-cache
        < HTTP/1.1 200 OK
-       < Pragma: no-cache
-       < Cache-Control: no-cache, max-age=0, must-revalidate
-       < Content-Type: application/x-git-upload-pack-advertisement
+       < pragma: no-cache
+       < cache-control: no-cache, max-age=0, must-revalidate
+       < content-type: application/x-git-upload-pack-advertisement
        > POST /smart/repo.git/git-upload-pack HTTP/1.1
-       > Accept-Encoding: ENCODINGS
-       > Content-Type: application/x-git-upload-pack-request
-       > Accept: application/x-git-upload-pack-result
-       > Accept-Language: ko-KR, *;q=0.9
-       > Content-Length: xxx
+       > accept-encoding: ENCODINGS
+       > content-type: application/x-git-upload-pack-request
+       > accept: application/x-git-upload-pack-result
+       > accept-language: ko-KR, *;q=0.9
+       > content-length: xxx
        < HTTP/1.1 200 OK
-       < Pragma: no-cache
-       < Cache-Control: no-cache, max-age=0, must-revalidate
-       < Content-Type: application/x-git-upload-pack-result
+       < pragma: no-cache
+       < cache-control: no-cache, max-age=0, must-revalidate
+       < content-type: application/x-git-upload-pack-result
        EOF
 
        GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION=0 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 |
+       perl -pe '\''
+               s/(Send|Recv) header: ([A-Za-z0-9-]+):/
+               "$1 header: " . lc($2) . ":"
+               /e;
+       '\'' |
        sed -e "
                s/Q\$//
                /^[*] /d
@@ -78,31 +83,31 @@ test_expect_success 'clone http repository' '
                        s/^/> /
                }
 
-               /^> User-Agent: /d
-               /^> Host: /d
+               /^> user-agent: /d
+               /^> host: /d
                /^> POST /,$ {
                        /^> Accept: [*]\\/[*]/d
                }
-               s/^> Content-Length: .*/> Content-Length: xxx/
+               s/^> content-length: .*/> content-length: xxx/
                /^> 00..want /d
                /^> 00.*done/d
 
-               /^< Server: /d
-               /^< Expires: /d
-               /^< Date: /d
-               /^< Content-Length: /d
-               /^< Transfer-Encoding: /d
+               /^< server: /d
+               /^< expires: /d
+               /^< date: /d
+               /^< content-length: /d
+               /^< transfer-encoding: /d
        " >actual &&
 
        # NEEDSWORK: If the overspecification of the expected result is reduced, we
        # might be able to run this test in all protocol versions.
        if test "$GIT_TEST_PROTOCOL_VERSION" = 0
        then
-               sed -e "s/^> Accept-Encoding: .*/> Accept-Encoding: ENCODINGS/" \
+               sed -e "s/^> accept-encoding: .*/> accept-encoding: ENCODINGS/" \
                                actual >actual.smudged &&
                test_cmp exp actual.smudged &&
 
-               grep "Accept-Encoding:.*gzip" actual >actual.gzip &&
+               grep "accept-encoding:.*gzip" actual >actual.gzip &&
                test_line_count = 2 actual.gzip
        fi
 '