t5551: Remove header from curl cookie file

The URL included in the header appears to vary from curl version to
curl version.  Since we only care about the final few lines, only test
them.  However, make sure the blank line after the header is still
included to make sure there are no extra cookie lines.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh
index 287d22b510babfcff7b46f7a0b422a209f9d2cb5..8196af19f68ac3772a81326828f7cdf83ae399a1 100755 (executable)
--- a/t/t5551-http-fetch.sh
+++ b/t/t5551-http-fetch.sh
@@ -191,9 +191,6 @@ cat >cookies.txt <<EOF
 127.0.0.1      FALSE   /smart_cookies/ FALSE   0       othername       othervalue
 EOF
 cat >expect_cookies.txt <<EOF
 127.0.0.1      FALSE   /smart_cookies/ FALSE   0       othername       othervalue
 EOF
 cat >expect_cookies.txt <<EOF

-# Netscape HTTP Cookie File
-# http://curl.haxx.se/docs/http-cookies.html
-# This file was generated by libcurl! Edit at your own risk.

 
 127.0.0.1      FALSE   /smart_cookies/ FALSE   0       othername       othervalue
 127.0.0.1      FALSE   /smart_cookies/repo.git/info/   FALSE   0       name    value
 
 127.0.0.1      FALSE   /smart_cookies/ FALSE   0       othername       othervalue
 127.0.0.1      FALSE   /smart_cookies/repo.git/info/   FALSE   0       name    value


@@ -202,7 +199,8 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set
        git config http.cookiefile cookies.txt &&
        git config http.savecookies true &&
        git ls-remote $HTTPD_URL/smart_cookies/repo.git master &&
        git config http.cookiefile cookies.txt &&
        git config http.savecookies true &&
        git ls-remote $HTTPD_URL/smart_cookies/repo.git master &&

-       test_cmp expect_cookies.txt cookies.txt
+       tail -3 cookies.txt > cookies_tail.txt
+       test_cmp expect_cookies.txt cookies_tail.txt

 '
 
 test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE
 '
 
 test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE