[PATCH] t/t3700: convert two uses of negation operator '!' to use test_must_fail
- From
Brandon Casey <casey@nrlssc.navy.mil>
- Date
- Jul 20, 2010, 15:24 UTC
- Message-ID
- <tMTpk3TmiYV54AYDiNJMBdnlXhSooJQQ1gRoAEsSwmcSwJ9ROgOpr75wpEQNx6_kZkqBtD71_QU@cipher.nrlssc.navy.mil>
From: Brandon Casey <drafnel@gmail.com>
These two lines use the negation '!' operator to negate the result of a simple command. Since these commands do not contain any pipes or other complexities, the test_must_fail function can be used and is preferred since it will additionally detect termination due to a signal.
This was noticed because the second use of '!' does not include a space between the '!' and the opening parens. Ksh interprets this as follows:
!(pattern-list)
Matches anything except one of the given patterns.Ksh performs a file glob using the pattern-list and then tries to execute the first file in the list. If a space is added between the '!' and the open parens, then Ksh will not interpret it as a pattern list, but in this case, it is preferred to use test_must_fail, so lets do so.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> --- t/t3700-add.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 47fbf53..d03495d 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -268,7 +268,7 @@ test_expect_success 'git add --dry-run of existing changed file' " test_expect_success 'git add --dry-run of non-existing file' " echo ignored-file >>.gitignore && - ! (git add --dry-run track-this ignored-file >actual 2>&1) && + test_must_fail git add --dry-run track-this ignored-file >actual 2>&1 && echo \"fatal: pathspec 'ignored-file' did not match any files\" | test_cmp - actual " @@ -281,7 +281,7 @@ add 'track-this' EOF test_expect_success 'git add --dry-run --ignore-missing of non-existing file' ' - !(git add --dry-run --ignore-missing track-this ignored-file >actual 2>&1) && + test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual 2>&1 && test_cmp expect actual '
-- 1.6.6.2