t1010-mktree: Adjust expected result to code and documentation

Michael J Gruber · gitster · commit 53b3c47d64b4 · 2010-04-17T10:30:00.000-07:00
The last two tests here were always supposed to fail in the sense
that, according to code and documentation, mktree should read non-recursive
ls-tree output, but not recursive one, and therefore explicitely refuses
to deal with slashes.

Adjust the test (must_fail) so that it succeeds when mktree dies on
slashes.

Signed-off-by: Michael J Gruber &lt;git@drmicha.warpmail.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh
@@ -58,14 +58,12 @@ test_expect_success 'allow missing object with --missing' '
 	test_cmp tree.missing actual
 '
 
-test_expect_failure 'mktree reads ls-tree -r output (1)' '
-	git mktree <all >actual &&
-	test_cmp tree actual
+test_expect_success 'mktree refuses to read ls-tree -r output (1)' '
+	test_must_fail git mktree <all >actual
 '
 
-test_expect_failure 'mktree reads ls-tree -r output (2)' '
-	git mktree <all.withsub >actual &&
-	test_cmp tree.withsub actual
+test_expect_success 'mktree refuses to read ls-tree -r output (2)' '
+	test_must_fail git mktree <all.withsub >actual
 '
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,12 @@ test_expect_success 'allow missing object with --missing' '`
`58`	`58`	`test_cmp tree.missing actual`
`59`	`59`	`'`
`60`	`60`
`61`		`-test_expect_failure 'mktree reads ls-tree -r output (1)' '`
`62`		`- git mktree <all >actual &&`
`63`		`- test_cmp tree actual`
	`61`	`+test_expect_success 'mktree refuses to read ls-tree -r output (1)' '`
	`62`	`+ test_must_fail git mktree <all >actual`
`64`	`63`	`'`
`65`	`64`
`66`		`-test_expect_failure 'mktree reads ls-tree -r output (2)' '`
`67`		`- git mktree <all.withsub >actual &&`
`68`		`- test_cmp tree.withsub actual`
	`65`	`+test_expect_success 'mktree refuses to read ls-tree -r output (2)' '`
	`66`	`+ test_must_fail git mktree <all.withsub >actual`
`69`	`67`	`'`
`70`	`68`
`71`	`69`	`test_done`