t/lib-httpd: respect $HTTPD_PROTO in expect_askpass()
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>
Jeff King committed
Feb 23, 2023 at 06:05 UTC
9d15b1e5df56dd4409766fe8ef55752436ca9f3d
1 file changed
+3
-3
t/lib-httpd.sh
+3
-3
@@ -280,11 +280,11 @@ expect_askpass() {
280
none)
281
;;
282
pass)
283
- echo "askpass: Password for 'http://$2@$dest': "
283
+ echo "askpass: Password for '$HTTPD_PROTO://$2@$dest': "
284
;;
285
both)
286
- echo "askpass: Username for 'http://$dest': "
287
- echo "askpass: Password for 'http://$2@$dest': "
286
+ echo "askpass: Username for '$HTTPD_PROTO://$dest': "
287
+ echo "askpass: Password for '$HTTPD_PROTO://$2@$dest': "
288
;;
289
*)
290
false