summaryrefslogtreecommitdiff
path: root/t/t4124-apply-ws-rule.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-03-20 10:09:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-20 17:20:15 (GMT)
commit0a5e3c50de60c73782f1add9eb8d1e8dc8eabcb8 (patch)
tree9f94c217fd91f07949de921a9b05d498e3d4291d /t/t4124-apply-ws-rule.sh
parenta167ece0c8cd9470427f8e9a1b43b27303eefa75 (diff)
downloadgit-0a5e3c50de60c73782f1add9eb8d1e8dc8eabcb8.zip
git-0a5e3c50de60c73782f1add9eb8d1e8dc8eabcb8.tar.gz
git-0a5e3c50de60c73782f1add9eb8d1e8dc8eabcb8.tar.bz2
t: use test_must_fail instead of hand-rolled blocks
These test scripts likely predate test_must_fail, and can be made simpler by using it (in addition to making them pass --chain-lint). The case in t6036 loses some verbosity in the failure case, but it is so tied to a specific failure mode that it is not worth keeping around (and the outcome of the test is not affected at all). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4124-apply-ws-rule.sh')
-rwxr-xr-xt/t4124-apply-ws-rule.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index c6474de..d350065 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -99,9 +99,8 @@ test_expect_success 'whitespace=warn, default rule' '
test_expect_success 'whitespace=error-all, default rule' '
- apply_patch --whitespace=error-all && return 1
- test -s target && return 1
- : happy
+ test_must_fail apply_patch --whitespace=error-all &&
+ ! test -s target
'