@matheusbsbs / matheus-bagliano / commits / 29e8dc50ad

t5551: compare sorted cookies files

In t5551 we check that we save cookies correctly to a file when http.cookiefile and http.savecookies are set. To do so we create an expect file that expects the cookies in a certain order. However after e2ef8d6fa ("cookies: support creation-time attribute for cookies", 2018-08-28) in curl.git (released in curl 7.61.1) that order changed. We document the file format as "Netscape/Mozilla cookie file format (see curl(1))", so any format produced by libcurl should be fine here. Sort the files, to be agnostic to the order of the cookies, and make the test pass with both curl versions > 7.61.1 and earlier curl versions. Reported-by: Todd Zullinger <tmz@pobox.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Thomas Gummerer committed Sep 17, 2018 at 22:46 UTC 29e8dc50adeca26b4f60989fc1227f987de0426a

1 file changed +2 -2

t/t5551-http-fetch-smart.sh

+2 -2

@@ -207,7 +207,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set

207 cat >cookies.txt <<-\EOF &&

208 127.0.0.1 FALSE /smart_cookies/ FALSE 0 othername othervalue

209 EOF

210 - cat >expect_cookies.txt <<-\EOF &&

210 + sort >expect_cookies.txt <<-\EOF &&

211

212 127.0.0.1 FALSE /smart_cookies/ FALSE 0 othername othervalue

213 127.0.0.1 FALSE /smart_cookies/repo.git/info/ FALSE 0 name value

@@ -215,7 +215,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set

215 git config http.cookiefile cookies.txt &&

216 git config http.savecookies true &&

217 git ls-remote $HTTPD_URL/smart_cookies/repo.git master &&

218 - tail -3 cookies.txt >cookies_tail.txt &&

218 + tail -3 cookies.txt | sort >cookies_tail.txt &&

219 test_cmp expect_cookies.txt cookies_tail.txt

220 '

221