summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gernhardt <brian@gernhardtsoftware.com>2013-08-05 15:59:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-08-05 18:02:53 (GMT)
commit580cf0a02ee15045a02c8ffefca646bbb0b1e953 (patch)
treeef6156aad8ec98905f27a1e1cbf1a3c3f104a9f2
parent912b2acf2f376e51bee32a486ca42ba4ad764363 (diff)
downloadgit-580cf0a02ee15045a02c8ffefca646bbb0b1e953.zip
git-580cf0a02ee15045a02c8ffefca646bbb0b1e953.tar.gz
git-580cf0a02ee15045a02c8ffefca646bbb0b1e953.tar.bz2
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>
-rwxr-xr-xt/t5551-http-fetch.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh
index 287d22b..8196af1 100755
--- 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
-# 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
@@ -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 &&
- 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