From: Junio C Hamano <gitster@pobox.com>
To: Todd Zullinger <tmz@pobox.com>
Cc: "Jeff King" <peff@peff.net>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing
Date: Tue, 11 Sep 2018 10:29:04 -0700 [thread overview]
Message-ID: <xmqqsh2gosdb.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180907232205.31328-1-tmz@pobox.com> (Todd Zullinger's message of "Fri, 7 Sep 2018 19:22:05 -0400")
Todd Zullinger <tmz@pobox.com> writes:
> 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)
>
> Signed-off-by: Todd Zullinger <tmz@pobox.com>
> ---
> [Resending with the list in Cc; sorry for spamming you,
> Junio, Jeff, and Gábor.]
> ...
> 7ae89caac6c721f16555e981eaeed64abc165c5d refs/heads/master
> 263207bb5fbfbefbdf1c9c3fa4ae5d9663323217 refs/namespaces/ns/refs/heads/master
> ++ tail -3 cookies.txt
> ++ test_cmp expect_cookies.txt cookies_tail.txt
> ++ diff -u expect_cookies.txt cookies_tail.txt
> --- expect_cookies.txt 2018-09-07 07:29:05.231532462 +0000
> +++ cookies_tail.txt 2018-09-07 07:29:05.306532366 +0000
Have you tried to apply this e-mail yourself before spamming the
list ;-)?
A good way to add supporting material that may be confusing to the
patch text itself is to indent them by one place with SP.
I'll manage anyway; thanks for a patch.
> @@ -1,3 +1,3 @@
>
> -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
> error: last command exited with $?=1
> not ok 22 - cookies stored in http.cookiefile when http.savecookies set
>
> t/t5551-http-fetch-smart.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
> index 771f36f9ff..538656bfef 100755
> --- a/t/t5551-http-fetch-smart.sh
> +++ b/t/t5551-http-fetch-smart.sh
> @@ -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
> '
prev parent reply other threads:[~2018-09-11 17:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 23:22 [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing Todd Zullinger
2018-09-07 23:55 ` Jeff King
2018-09-08 3:28 ` Todd Zullinger
2018-09-08 16:17 ` Jeff King
2018-09-17 21:45 ` Junio C Hamano
2018-09-17 22:25 ` Jeff King
2018-09-18 1:55 ` Junio C Hamano
2018-09-11 17:29 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsh2gosdb.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=szeder.dev@gmail.com \
--cc=tmz@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).