diff options
| author |  Jeff King <peff@peff.net> | 2015-03-20 06:09:22 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-03-20 10:20:15 -0700 |
| commit | 0a5e3c50de60c73782f1add9eb8d1e8dc8eabcb8 (patch) | |
| tree | 9f94c217fd91f07949de921a9b05d498e3d4291d /t/t4124-apply-ws-rule.sh | |
| parent | t: use verbose instead of hand-rolled errors (diff) | |
| download | tgif-0a5e3c50de60c73782f1add9eb8d1e8dc8eabcb8.tar.xz | |
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-x | t/t4124-apply-ws-rule.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh index c6474de4c8..d350065f25 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 ' |