undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4124: only mark git command with test_must_fail

Browse Source 
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>
This commit is contained in:
Denton Liu 2020-01-06 23:53:13 -05:00 committed by Junio C Hamano
parent a8c663cf65
commit 37a63faae5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t4124-apply-ws-rule.sh
View File

@ -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
'