| Message ID | Y/dIk5Zex6Sq2p8h@coredump.intra.peff.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9d15b1e5df56dd4409766fe8ef55752436ca9f3d |
| Headers | show |
| Series | [01/16] t5541: run "used receive-pack service" test earlier | expand |
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 5d2d56c445..8f59e9dff8 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -283,11 +283,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
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> --- t/lib-httpd.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)