diff options
| author | Jeff King <peff@peff.net> | 2009-02-25 03:32:08 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-26 00:49:44 -0800 |
| commit | 75318a3bad4b7a25f617217891bfbcec26a9161a (patch) | |
| tree | d45c6de5a4621d7dedbb0203545ccaa9045b4d56 | |
| parent | 661763abf6e13eabf0aa1a3eefd364d32da8f4ad (diff) | |
| download | git-75318a3bad4b7a25f617217891bfbcec26a9161a.tar.gz git-75318a3bad4b7a25f617217891bfbcec26a9161a.tar.xz | |
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>
| -rw-r--r-- | t/lib-httpd.sh | 9 | ||||
| -rwxr-xr-x | t/t5540-http-push.sh | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 86cdebc72..589aaf821 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -94,13 +94,18 @@ prepare_httpd() { } start_httpd() { - prepare_httpd + prepare_httpd >&3 2>&4 trap 'stop_httpd; die' EXIT "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ -f "$TEST_PATH/apache.conf" $HTTPD_PARA \ - -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start + -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \ + >&3 2>&4 + if ! test $? = 0; then + say "skipping test, web server setup failed" + test_done + fi } stop_httpd() { diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh index 11b343274..57a4411e9 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" && |