test: am of empty patch should not succeed

jrn · gitster · commit 948065a4837f · 2012-04-14T16:17:12.000-07:00
The "git am empty" test uses the construct

	git am empty-file &amp;&amp; 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 &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 '

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ test_expect_success 'am empty-file does not infloop' '`
`525`	`525`	`git reset --hard &&`
`526`	`526`	`touch empty-file &&`
`527`	`527`	`test_tick &&`
`528`		`- { git am empty-file > actual 2>&1 && false \|\| :; } &&`
	`528`	`+ test_must_fail git am empty-file 2>actual &&`
`529`	`529`	`echo Patch format detection failed. >expected &&`
`530`	`530`	`test_i18ncmp expected actual`
`531`	`531`	`'`