Jeff King <peff@xxxxxxxx> writes: > Yes, I think sorting the expect file would work fine. I'm OK with that, > or just leaving a comment. The comment has the bonus that it does not > cost an extra process at runtime. I'd probably use a sort if we expected > the list to be long and complicated, since it makes life easier on a > future developer. But since there are only 2 lines, I don't think it's a > big deal either way (or even just leaving it as-is without a comment is > probably OK). Let's have "| sort" if only for its documentation value. That way we do not have to remember the list must be sorted. Here is what I'll merge to 'next'. -- >8 -- From: Todd Zullinger <tmz@xxxxxxxxx> Date: Fri, 7 Sep 2018 19:22:05 -0400 Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With curl-7.61.1 cookies are sorted by creation-time¹. Sort the output used in the 'cookies stored in http.cookiefile when http.savecookies set' test before comparing it to the expected cookies. ¹ https://github.com/curl/curl/commit/e2ef8d6fa ("cookies: support creation-time attribute for cookies", 2018-08-28) [jc: Also use a part of the patch by Thomas Gummerer that sorts the expected output, which makes it easier to maintain.] Signed-off-by: Todd Zullinger <tmz@xxxxxxxxx> Helped-by: Thomas Gummerer <t.gummerer@xxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- t/t5551-http-fetch-smart.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh index 771f36f9ff..d13b993201 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -206,7 +206,7 @@ test_expect_success 'dumb clone via http-backend respects namespace' ' cat >cookies.txt <<EOF 127.0.0.1 FALSE /smart_cookies/ FALSE 0 othername othervalue EOF -cat >expect_cookies.txt <<EOF +cat <<EOF | sort >expect_cookies.txt 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 @@ -215,7 +215,7 @@ 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 && - tail -3 cookies.txt >cookies_tail.txt && + tail -3 cookies.txt | sort >cookies_tail.txt && test_cmp expect_cookies.txt cookies_tail.txt ' -- 2.19.0
