Re: [PATCH] t5551: compare sorted cookies files
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 17, 2018, 19:55 UTC
- Message-ID
- <xmqqtvmn6gra.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20180917191806.19958-1-t.gummerer@gmail.com>
Thomas Gummerer <t.gummerer@gmail.com> writes:
Show 16 quoted lines
> 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.
>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> ---Thanks. f5b2c9c9 ("t5551-http-fetch-smart.sh: sort cookies before comparing", 2018-09-07) that came from
https://public-inbox.org/git/20180907232205.31328-1-tmz@pobox.com
has almost the identical patch text, and this (presumably an independent effort) confirms that the patch is needed. The other effort implicitly depends on the expected output is kept sorted, but this one is more explicit---I tend to prefer this approach as tools and automation is easier to maintain than having to remember that the source must be sorted.
Thanks.
Show 24 quoted lines
> 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 > '