From: Johannes Sixt <j6t@kdbg.org>
Date: Thu, 19 Nov 2015 19:09:44 GMT
Subject: [PATCH 2/7] modernize t9300: use test_must_fail
Message-ID: <46b654a91df9ae0c85e406e6a17ca918b63351ee.1447959452.git.j6t@kdbg.org>
In-Reply-To: <cover.1447959452.git.j6t@kdbg.org>

One test case open-codes a test for an expected failure. Replace it by
test_must_fail.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 t/t9300-fast-import.sh | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 566f7bd..e9c7602 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -630,20 +630,9 @@ from refs/heads/branch
 
 INPUT_END
 test_expect_success 'F: non-fast-forward update skips' '
-	if git fast-import <input
-	then
-		echo BAD gfi did not fail
-		return 1
-	else
-		if test $old_branch = `git rev-parse --verify branch^0`
-		then
-			: branch unaffected and failure returned
-			return 0
-		else
-			echo BAD gfi changed branch $old_branch
-			return 1
-		fi
-	fi
+	test_must_fail git fast-import <input &&
+	# branch must remain unaffected
+	test $old_branch = `git rev-parse --verify branch^0`
 '
 
 test_expect_success 'F: verify pack' '
-- 
2.6.2.337.ga235d84