t5551: handle v2 protocol in cookie test

After making a request, we check that it stored the expected cookies.
This depends on the protocol version, because the cookies we store
depend on the exact requests we made (and for ls-remote, v2 will always
hit /git-upload-pack to get the refs, whereas v0 is happy with the
initial ref advertisement).

As a result, hardly anybody runs this test, as you'd have to manually
set GIT_TEST_PROTOCOL_VERSION=0 to do so.

Let's teach it to handle both protocol versions. One way to do this
would be to make the expectation conditional on the protocol used. But
there's a simpler solution. The reason that v0 doesn't hit
/git-upload-pack is that ls-remote doesn't fetch any objects. If we
instead do a fetch (making sure there's an actual object to grab), then
both v0 and v2 will hit the same endpoints and set the same cookies.

Note that we do have to clean up our new tag here; otherwise it confuses
the later "clone 2,000 tags" test.

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 2f15a707d45c61c17f0a6e981647ae1e6f1844fc..2e42271cb8126c20ad501aaf80657d45d878825b 100755 (executable)
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -295,19 +295,22 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set
        EOF
        sort >expect_cookies.txt <<-\EOF &&
        127.0.0.1       FALSE   /smart_cookies/ FALSE   0       othername       othervalue
+       127.0.0.1       FALSE   /smart_cookies/repo.git/        FALSE   0       name    value
        127.0.0.1       FALSE   /smart_cookies/repo.git/info/   FALSE   0       name    value
        EOF
        git config http.cookiefile cookies.txt &&
        git config http.savecookies true &&
-       git ls-remote $HTTPD_URL/smart_cookies/repo.git main &&
 
-       # 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
-               grep "^[^#]" cookies.txt | sort >cookies_stripped.txt &&
-               test_cmp expect_cookies.txt cookies_stripped.txt
-       fi
+       test_when_finished "
+               git --git-dir=\"\$HTTPD_DOCUMENT_ROOT_PATH/repo.git\" \
+                       tag -d cookie-tag
+       " &&
+       git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
+               tag -m "foo" cookie-tag &&
+       git fetch $HTTPD_URL/smart_cookies/repo.git cookie-tag &&
+
+       grep "^[^#]" cookies.txt | sort >cookies_stripped.txt &&
+       test_cmp expect_cookies.txt cookies_stripped.txt
 '
 
 test_expect_success 'transfer.hiderefs works over smart-http' '