t9834: remove use of test_might_fail p4

Denton-L · gitster · commit 6e7b0ea864c6 · 2020-07-07T13:07:27.000-07:00
The test_must_fail() family of functions (including test_might_fail())
should only be used on git commands. Replace test_might_fail() with
a compound command wrapping the old p4 invocation that always returns 0.

Signed-off-by: Denton Liu &lt;liu.denton@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t9834-git-p4-file-dir-bug.sh b/t/t9834-git-p4-file-dir-bug.sh
@@ -10,7 +10,7 @@ repository.'
 
 test_expect_success 'start p4d' '
 	start_p4d &&
-	test_might_fail p4 configure set submit.collision.check=0
+	{ p4 configure set submit.collision.check=0 || :; }
 '
 
 test_expect_success 'init depot' '

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ repository.'`
`10`	`10`
`11`	`11`	`test_expect_success 'start p4d' '`
`12`	`12`	`start_p4d &&`
`13`		`- test_might_fail p4 configure set submit.collision.check=0`
	`13`	`+ { p4 configure set submit.collision.check=0 \|\| :; }`
`14`	`14`	`'`
`15`	`15`
`16`	`16`	`test_expect_success 'init depot' '`