diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2020-07-07 02:04:37 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-07-07 13:07:27 -0700 |
| commit | 6e7b0ea864c61288bd5276f3e3cd9250e7a3802d (patch) | |
| tree | d9670f2eeffc2c96e3f3e9c989d4569bc2df58e7 /t/t9834-git-p4-file-dir-bug.sh | |
| parent | t7107: don't use test_must_fail() (diff) | |
| download | tgif-6e7b0ea864c61288bd5276f3e3cd9250e7a3802d.tar.xz | |
t9834: remove use of `test_might_fail p4`
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9834-git-p4-file-dir-bug.sh')
| -rwxr-xr-x | t/t9834-git-p4-file-dir-bug.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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' ' |