global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-07 00:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/test-curl-updates'

Browse Source 
Update HTTP tests to adjust for changes in curl 8.18.0

* jk/test-curl-updates:
  t5563: add missing end-of-line in HTTP header
  t5551: handle trailing slashes in expected cookies output
This commit is contained in:
Junio C Hamano
2025-12-30 12:58:22 +09:00
parent e7b1925381 17f4b01da7
commit a37bb2ae6c
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
t/t5551-http-fetch-smart.sh
View File

@@ -333,12 +333,12 @@ test_expect_success 'dumb clone via http-backend respects namespace' '
test_expect_success 'cookies stored in http.cookiefile when http.savecookies set' '
cat >cookies.txt <<-\EOF &&
127.0.0.1 FALSE /smart_cookies/ FALSE 0 othername othervalue
127.0.0.1 FALSE /smart_cookies FALSE 0 othername othervalue
EOF
sort >expect_cookies.txt <<-\EOF &&
127.0.0.1 FALSE /smart_cookies/ FALSE 0 othername othervalue
127.0.0.1 FALSE /smart_cookies/repo.git/ FALSE 0 name value
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
127.0.0.1 FALSE /smart_cookies/repo.git FALSE 0 name value
127.0.0.1 FALSE /smart_cookies/repo.git/info FALSE 0 name value
EOF
git config http.cookiefile cookies.txt &&
git config http.savecookies true &&
@@ -351,8 +351,11 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set
tag -m "foo" cookie-tag &&
git fetch $HTTPD_URL/smart_cookies/repo.git cookie-tag &&
grep "^[^#]" cookies.txt | sort >cookies_stripped.txt &&
test_cmp expect_cookies.txt cookies_stripped.txt
# Strip trailing slashes from cookie paths to handle output from both
# old curl ("/smart_cookies/") and new ("/smart_cookies").
HT=" " &&
grep "^[^#]" cookies.txt | sed "s,/$HT,$HT," | sort >cookies_clean.txt &&
test_cmp expect_cookies.txt cookies_clean.txt
'
test_expect_success 'transfer.hiderefs works over smart-http' '

4
t/t5563-simple-http-auth.sh
View File

@@ -469,7 +469,7 @@ test_expect_success 'access using basic auth with wwwauth header empty continuat
EOF
'
test_expect_success 'access using basic auth with wwwauth header mixed line-endings' '
test_expect_success 'access using basic auth with wwwauth header mixed continuations' '
test_when_finished "per_test_cleanup" &&
set_credential_reply get <<-EOF &&
@@ -490,7 +490,7 @@ test_expect_success 'access using basic auth with wwwauth header mixed line-endi
printf "id=default response=WWW-Authenticate: FooBar param1=\"value1\"\r\n" >>"$CHALLENGE" &&
printf "id=default response= \r\n" >>"$CHALLENGE" &&
printf "id=default response=\tparam2=\"value2\"\r\n" >>"$CHALLENGE" &&
printf "id=default response=WWW-Authenticate: Basic realm=\"example.com\"" >>"$CHALLENGE" &&
printf "id=default response=WWW-Authenticate: Basic realm=\"example.com\"\r\n" >>"$CHALLENGE" &&
test_config_global credential.helper test-helper &&
git ls-remote "$HTTPD_URL/custom_auth/repo.git" &&