git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Clemens Buchacher <drizzd@aon.at>,
	tobiasu@tmux.org
Subject: [PATCH] t5541: avoid TAP test miscounting
Date: Mon,  5 Sep 2011 16:24:06 +0200	[thread overview]
Message-ID: <e4e82f1267da3edfc600361de0041f618c31e30c.1315232475.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <4E64DA0A.8090202@drmicha.warpmail.net>

lib-terminal.sh runs a test and thus increases the test count, but the
output is lost so that TAP produces a "no plan found error".

Move the lib-terminal call after the lib-httpd and make TAP happy
(though still leave me clueless).

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 t/t5541-http-push.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 0dcb8df..a18265c 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -5,7 +5,6 @@
 
 test_description='test smart pushing over http via http-backend'
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-terminal.sh
 
 if test -n "$NO_CURL"; then
 	skip_all='skipping test, git built without http support'
@@ -15,6 +14,7 @@ fi
 ROOT_PATH="$PWD"
 LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5541'}
 . "$TEST_DIRECTORY"/lib-httpd.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
 start_httpd
 
 test_expect_success 'setup remote repository' '
-- 
1.7.7.rc0.328.g9d6c7

  reply	other threads:[~2011-09-05 14:24 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-03 10:57 [BUG] git push --quiet fails with older versions Tobias Ulmer
2011-09-03 16:34 ` Clemens Buchacher
2011-09-03 16:34   ` [PATCH 1/3] tests for push --quiet Clemens Buchacher
2011-09-03 16:34   ` [PATCH 2/3] fix push --quiet via http Clemens Buchacher
2011-09-03 16:34   ` [PATCH 3/3] push: old receive-pack does not understand --quiet Clemens Buchacher
2011-09-05  2:28     ` Junio C Hamano
2011-09-05  3:01       ` Junio C Hamano
2011-09-05  8:35     ` Junio C Hamano
2011-09-05  9:23       ` Michael J Gruber
2011-09-05 14:17         ` Michael J Gruber
2011-09-05 14:24           ` Michael J Gruber [this message]
2011-09-05 19:34         ` Junio C Hamano
2011-09-06  6:03           ` Michael J Gruber
2011-09-06 18:01     ` Junio C Hamano
2011-09-06 19:52       ` Clemens Buchacher
2011-09-04 12:08   ` [BUG] git push --quiet fails with older versions Tobias Ulmer
2011-09-04 19:02 ` Junio C Hamano

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=e4e82f1267da3edfc600361de0041f618c31e30c.1315232475.git.git@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=drizzd@aon.at \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tobiasu@tmux.org \
    /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).