git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jens Lehmann <Jens.Lehmann@web.de>
To: Jeff King <peff@peff.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] t5541: don't call start_httpd after sourcing lib-terminal.sh
Date: Fri, 14 Mar 2014 22:18:32 +0100	[thread overview]
Message-ID: <53237228.10809@web.de> (raw)

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

             reply	other threads:[~2014-03-14 21:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-14 21:18 Jens Lehmann [this message]
2014-03-14 21:37 ` [PATCH] t5541: don't call start_httpd after sourcing lib-terminal.sh Jeff King
2014-03-14 21:47   ` Junio C Hamano
2014-03-14 21:57     ` [PATCH] t/lib-terminal: make TTY a lazy prerequisite Jeff King
2014-03-14 22:05       ` Junio C Hamano
2014-03-15  1:55         ` Jeff King
2014-03-14 22:13       ` Jens Lehmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53237228.10809@web.de \
    --to=jens.lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).