t3505: fix abuse of test_expect_code

gitster · gitster · commit c6720cfa49fd · 2009-06-21T02:01:28.000-07:00
The test wanted to make sure that cherry-pick exits with status 1,
but with the way it was placed after "git checkout master &amp;&amp;" meant
that it could have misjudged success if checkout barfed with the
same failure status.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh
@@ -17,11 +17,11 @@ test_expect_success setup '
 
 '
 
-test_expect_code 1 'cherry-pick an empty commit' '
-
-	git checkout master &&
-	git cherry-pick empty-branch
-
+test_expect_success 'cherry-pick an empty commit' '
+	git checkout master && {
+		git cherry-pick empty-branch
+		test "$?" = 1
+	}
 '
 
 test_expect_success 'index lockfile was removed' '

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ test_expect_success setup '`
`17`	`17`
`18`	`18`	`'`
`19`	`19`
`20`		`-test_expect_code 1 'cherry-pick an empty commit' '`
`21`		`-`
`22`		`- git checkout master &&`
`23`		`- git cherry-pick empty-branch`
`24`		`-`
	`20`	`+test_expect_success 'cherry-pick an empty commit' '`
	`21`	`+ git checkout master && {`
	`22`	`+ git cherry-pick empty-branch`
	`23`	`+ test "$?" = 1`
	`24`	`+ }`
`25`	`25`	`'`
`26`	`26`
`27`	`27`	`test_expect_success 'index lockfile was removed' '`