summaryrefslogtreecommitdiff
path: root/t/t5540-http-push.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-02-25 03:32:08 -0500
committerJunio C Hamano <gitster@pobox.com>2009-02-26 00:49:44 -0800
commit75318a3bad4b7a25f617217891bfbcec26a9161a (patch)
treed45c6de5a4621d7dedbb0203545ccaa9045b4d56 /t/t5540-http-push.sh
parent661763abf6e13eabf0aa1a3eefd364d32da8f4ad (diff)
downloadgit-75318a3bad4b7a25f617217891bfbcec26a9161a.tar.gz
test scripts: refactor start_httpd helper
There are some redirects and some error checking that need to be done by the caller; let's move both into the start_httpd function so that all callers don't have to repeat them (there is only one caller now, but another will follow in this series). This doesn't violate any assumptions that aren't already being made by lib-httpd, which is happy to say "skipping" and call test_done for a number of other cases. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5540-http-push.sh')
-rwxr-xr-xt/t5540-http-push.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index 11b343274f..57a4411e98 100755
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -20,13 +20,7 @@ then
fi
. "$TEST_DIRECTORY"/lib-httpd.sh
-
-if ! start_httpd >&3 2>&4
-then
- say "skipping test, web server setup failed"
- test_done
- exit
-fi
+start_httpd
test_expect_success 'setup remote repository' '
cd "$ROOT_PATH" &&