diff options
author | Stephan Beyer <s-beyer@gmx.net> | 2008-07-12 17:47:52 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-13 13:21:26 -0700 |
commit | d492b31cafe9aa5ce001b1d48815f4c0bb40d01a (patch) | |
tree | 9782e7f8110a866423b8d752783e0fcddc8c0508 /t/t4150-am.sh | |
parent | 5a26973025bce74782571844c7b8091d1cd7c405 (diff) | |
download | git-d492b31cafe9aa5ce001b1d48815f4c0bb40d01a.tar.gz git-d492b31cafe9aa5ce001b1d48815f4c0bb40d01a.tar.xz |
t/: Use "test_must_fail git" instead of "! git"
This patch changes every occurrence of "! git" -- with the meaning
that a git call has to gracefully fail -- into "test_must_fail git".
This is useful to
- make sure the test does not fail because of a signal,
e.g. SIGSEGV, and
- advertise the use of "test_must_fail" for new tests.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4150-am.sh')
-rwxr-xr-x | t/t4150-am.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index bc982607d..476f20b50 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -182,7 +182,7 @@ test_expect_success 'am -3 falls back to 3-way merge' ' test_expect_success 'am pauses on conflict' ' git checkout lorem2^^ && - ! git am lorem-move.patch && + test_must_fail git am lorem-move.patch && test -d .dotest ' @@ -195,7 +195,7 @@ test_expect_success 'am --skip works' ' test_expect_success 'am --resolved works' ' git checkout lorem2^^ && - ! git am lorem-move.patch && + test_must_fail git am lorem-move.patch && test -d .dotest && echo resolved >>file && git add file && @@ -212,13 +212,13 @@ test_expect_success 'am takes patches from a Pine mailbox' ' ' test_expect_success 'am fails on mail without patch' ' - ! git am <failmail && + test_must_fail git am <failmail && rm -r .dotest/ ' test_expect_success 'am fails on empty patch' ' echo "---" >>failmail && - ! git am <failmail && + test_must_fail git am <failmail && git am --skip && ! test -d .dotest ' |