summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-05-09 08:19:00 +0200
committerJunio C Hamano <gitster@pobox.com>2016-05-10 10:28:01 -0700
commite31165ce69ef3986e8b5477d52cc7d4e19b4212d (patch)
treeb433d37f2e6dd4fd39f5f48d3fcb7256fec5510b
parentf1f2b45be0a2b205fc07758e0f4e9c13e90d34d9 (diff)
downloadgit-e31165ce69ef3986e8b5477d52cc7d4e19b4212d.tar.gz
t5551: make the test for extra HTTP headers more robust
To test that extra HTTP headers are passed correctly, t5551 verifies that a fetch succeeds when two required headers are passed, and that the fetch does not succeed when those headers are not passed. However, this test would also succeed if the configuration required only one header. As Apache's configuration is notoriously tricky (this developer frequently requires StackOverflow's help to understand Apache's documentation), especially when still supporting the 2.2 line, let's just really make sure that the test verifies what we want it to verify. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5551-http-fetch-smart.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index e44fe72c7a..43b257e7fd 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -283,7 +283,8 @@ test_expect_success EXPENSIVE 'http can handle enormous ref negotiation' '
'
test_expect_success 'custom http headers' '
- test_must_fail git fetch "$HTTPD_URL/smart_headers/repo.git" &&
+ test_must_fail git -c http.extraheader="x-magic-two: cadabra" \
+ fetch "$HTTPD_URL/smart_headers/repo.git" &&
git -c http.extraheader="x-magic-one: abra" \
-c http.extraheader="x-magic-two: cadabra" \
fetch "$HTTPD_URL/smart_headers/repo.git"