diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2020-01-06 23:53:13 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-01-27 12:56:02 -0800 |
| commit | 37a63faae58aee5cd2dd9806d2e98c9ad998a7e5 (patch) | |
| tree | 35946abb75fd55bdb053061d671d971643377215 /t | |
| parent | t3507: use test_path_is_missing() (diff) | |
| download | tgif-37a63faae58aee5cd2dd9806d2e98c9ad998a7e5.tar.xz | |
t4124: only mark git command with test_must_fail
The test_must_fail function should only be used for git commands since
we should assume that external commands work sanely. Since apply_patch
wraps a sed and git invocation, rewrite it to accept an `!` argument
which would cause only the git command to be prefixed with
`test_must_fail`.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4124-apply-ws-rule.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh index ff51e9e789..971a5a7512 100755 --- a/t/t4124-apply-ws-rule.sh +++ b/t/t4124-apply-ws-rule.sh @@ -35,9 +35,15 @@ prepare_test_file () { } apply_patch () { + cmd_prefix= && + if test "x$1" = 'x!' + then + cmd_prefix=test_must_fail && + shift + fi && >target && sed -e "s|\([ab]\)/file|\1/target|" <patch | - git apply "$@" + $cmd_prefix git apply "$@" } test_fix () { @@ -99,7 +105,7 @@ test_expect_success 'whitespace=warn, default rule' ' test_expect_success 'whitespace=error-all, default rule' ' - test_must_fail apply_patch --whitespace=error-all && + apply_patch ! --whitespace=error-all && test_must_be_empty target ' |