All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Jeff King <peff@peff.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Piotr Krukowiecki" <piotr.krukowiecki@gmail.com>,
	"Git Mailing List" <git@vger.kernel.org>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Jiang Xin" <worldhello.net@gmail.com>,
	"Jim Meyering" <jim@meyering.net>
Subject: [PATCH 3/3] test: am of empty patch should not succeed
Date: Fri, 13 Apr 2012 23:48:13 -0500	[thread overview]
Message-ID: <20120414044813.GD1791@burratino> (raw)
In-Reply-To: <20120414044413.GA1791@burratino>

The "git am empty" test uses the construct

	git am empty-file && false || :

which unconditionally returns true.  Use test_must_fail instead, which
also has the benefit of noticing if "git am" has segfaulted.

While at it, tighten the test to check that the diagnostic appears on
stderr and not stdout.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Tested this time.  Thanks for reading.

 t/t4150-am.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index ebb4a26a..cdafd7e7 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -525,7 +525,7 @@ test_expect_success 'am empty-file does not infloop' '
 	git reset --hard &&
 	touch empty-file &&
 	test_tick &&
-	{ git am empty-file > actual 2>&1 && false || :; } &&
+	test_must_fail git am empty-file 2>actual &&
 	echo Patch format detection failed. >expected &&
 	test_i18ncmp expected actual
 '
-- 
1.7.10

  parent reply	other threads:[~2012-04-14  4:48 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-19 21:53 [bug] git checkout lies about number of ahead commits when switching from detached HEAD Piotr Krukowiecki
2011-03-19 22:28 ` Jeff King
2011-03-19 22:47   ` Jeff King
2011-03-20  0:35     ` Junio C Hamano
2011-03-20  9:01       ` Jeff King
2011-03-20  9:04         ` [PATCH 1/3] checkout: add basic tests for detached-orphan warning Jeff King
2011-03-20  9:09         ` [PATCH 2/3] checkout: clear commit marks after detached-orphan check Jeff King
2011-03-20 19:05           ` Junio C Hamano
2012-04-13 22:59           ` [PATCH] i18n: use test_i18ncmp in t2020 (checkout --detach) Jonathan Nieder
2012-04-13 23:25             ` [PATCH/RFC] checkout --detached test: write supporting files before start of tests Jonathan Nieder
2012-04-13 23:33               ` Jeff King
2012-04-13 23:49                 ` Jonathan Nieder
2012-04-14  2:26                   ` Jeff King
2012-04-13 23:30             ` [PATCH] i18n: use test_i18ncmp in t2020 (checkout --detach) Jeff King
2012-04-13 23:46               ` Jonathan Nieder
2012-04-14  2:24                 ` Jeff King
2012-04-14  4:44                   ` [PATCH v2 0/3] " Jonathan Nieder
2012-04-14  4:45                     ` [PATCH 1/3] test: do not rely on US English tracking-info messages Jonathan Nieder
2012-04-14  4:46                     ` [PATCH 2/3] test: use test_i18ncmp for "Patch format detection failed" message Jonathan Nieder
2012-04-14  4:48                     ` Jonathan Nieder [this message]
2012-04-14  8:15                     ` [PATCH v2 0/3] Re: i18n: use test_i18ncmp in t2020 (checkout --detach) Jeff King
2012-04-14  5:02                   ` [PATCH] " Jonathan Nieder
2012-04-14  8:22                     ` Jeff King
2012-04-14 12:47                       ` Jonathan Nieder
2011-03-20  9:19         ` [PATCH 3/3] checkout: tweak detached-orphan warning format Jeff King
2011-03-20 19:00         ` [bug] git checkout lies about number of ahead commits when switching from detached HEAD Junio C Hamano
2011-03-21 10:35           ` Jeff King
2011-03-21 15:17             ` 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=20120414044813.GD1791@burratino \
    --to=jrnieder@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jim@meyering.net \
    --cc=peff@peff.net \
    --cc=piotr.krukowiecki@gmail.com \
    --cc=worldhello.net@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.