merge hook tests: use 'test_must_fail' instead of '!'

benoit-pierre · gitster · commit b7ae14148fc4 · 2014-03-11T13:57:43.000-07:00
Signed-off-by: Benoit Pierre &lt;benoit.pierre@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
@@ -154,7 +154,7 @@ test_expect_success 'with failing hook' '
 	head=`git rev-parse HEAD` &&
 	echo "more" >> file &&
 	git add file &&
-	! GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
+	test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
 
 '
 
@@ -163,7 +163,7 @@ test_expect_success 'with failing hook (--no-verify)' '
 	head=`git rev-parse HEAD` &&
 	echo "more" >> file &&
 	git add file &&
-	! GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head
+	test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head
 
 '
 

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ test_expect_success 'with failing hook' '`
`154`	`154`	head=`git rev-parse HEAD` &&
`155`	`155`	`echo "more" >> file &&`
`156`	`156`	`git add file &&`
`157`		`- ! GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head`
	`157`	`+ test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head`
`158`	`158`
`159`	`159`	`'`
`160`	`160`
`@@ -163,7 +163,7 @@ test_expect_success 'with failing hook (--no-verify)' '`
`163`	`163`	head=`git rev-parse HEAD` &&
`164`	`164`	`echo "more" >> file &&`
`165`	`165`	`git add file &&`
`166`		`- ! GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head`
	`166`	`+ test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head`
`167`	`167`
`168`	`168`	`'`
`169`	`169`