[PATCH] t5541: don't call start_httpd after sourcing lib-terminal.sh
- From
Jens Lehmann <jens.lehmann@web.de>
- Date
- Mar 14, 2014, 21:18 UTC
- Message-ID
- <53237228.10809@web.de>
Since 83d842dc8 "make test" using prove fails for some setups in t5541 with:
"Parse errors: No plan found in TAP output"
Running t5541 on its own fails with:
"error: Can't use skip_all after running some tests"
This happens because "start_httpd" (which determines if the test is to be skipped) is called after sourcing lib-terminal.sh (which sets up the terminal using test_expect_success).
Fix that by calling "start_httpd" before sourcing lib-terminal.sh.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> ---
Since recently t5541 fails for me on master and pu. I'm not sure what detail in my setup causes this breakage (I have httpd installed and it is running), but this patch fixes it for me.
t/t5541-http-push-smart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh index 73af16f..597fb96 100755 --- a/t/t5541-http-push-smart.sh +++ b/t/t5541-http-push-smart.sh @@ -13,8 +13,8 @@ fi ROOT_PATH="$PWD" . "$TEST_DIRECTORY"/lib-httpd.sh -. "$TEST_DIRECTORY"/lib-terminal.sh start_httpd +. "$TEST_DIRECTORY"/lib-terminal.sh test_expect_success 'setup remote repository' ' cd "$ROOT_PATH" &&
-- 1.9.0.168.g1119394