[PATCH 4/5] t9834: remove use of `test_might_fail p4`
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Jun 30, 2020, 15:03 UTC
- Message-ID
- <1287798e691bd3be1ac094bacae5149560c9e6df.1593529394.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1593529394.git.liu.denton@gmail.com>
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 <liu.denton@gmail.com> --- t/t9834-git-p4-file-dir-bug.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9834-git-p4-file-dir-bug.sh b/t/t9834-git-p4-file-dir-bug.sh index 031e1f8668..dac67e89d7 100755 --- 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' '
-- 2.27.0.383.g050319c2ae