undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/lib-httpd: respect $HTTPD_PROTO in expect_askpass()

Browse Source 
When the HTTP tests are run with LIB_HTTPD_SSL in the environment, then
we access the test server as https://. This causes expect_askpass to
complain, because it tries to blindly match "http://" in the prompt
shown to the user. We can adjust this to use $HTTPD_PROTO, which is set
during the setup phase.

Note that this is enough for t5551 and t5559 to pass when run with
https, but there are similar problems in other scripts that will need to
be fixed before the whole suite can run with LIB_HTTPD_SSL.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2023-02-23 06:05:55 -05:00 committed by Junio C Hamano
parent b71a2bf11f
commit 9d15b1e5df
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/lib-httpd.sh
View File

@ -280,11 +280,11 @@ expect_askpass() {
none)
;;
pass)
echo "askpass: Password for 'http://$2@$dest': "
echo "askpass: Password for '$HTTPD_PROTO://$2@$dest': "
;;
both)
echo "askpass: Username for 'http://$dest': "
echo "askpass: Password for 'http://$2@$dest': "
echo "askpass: Username for '$HTTPD_PROTO://$dest': "
echo "askpass: Password for '$HTTPD_PROTO://$2@$dest': "
;;
*)
false