On Mon, Aug 5, 2013 at 8:59 AM, Brian Gernhardt <brian@xxxxxxxxxxxxxxxxxxxxx> wrote: > > 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@xxxxxxxxxxxxxxxxxxxxx> > --- > > I suppose a sed invocation to strip out the URL or comments might be better, > but this seemed simpler. > > t/t5551-http-fetch.sh | 6 ++---- > 1 file 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 Would it make more sense to ignore comments entirely? I.e. instead of taking the tail, pipe through sed 's/#.*//'. Thanks for catching this by the way; you can probably guess that I only checked with a single curl version. > > + test_cmp expect_cookies.txt cookies_tail.txt > ' > > test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE > -- > 1.8.4.rc1.384.g0976a17.dirty > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html