[PATCH 3/7] modernize t9300: use test_must_be_empty
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Nov 19, 2015, 19:09 UTC
- Message-ID
- <52bae1a41e445d308cbfea21dfd696bc16df3cbf.1447959452.git.j6t@kdbg.org>
- In-Reply-To
- <cover.1447959452.git.j6t@kdbg.org>
Instead of comparing actual output to an empty file, use test_must_be_empty. In addition to the better error message provided by the helper, allocation of an empty file during the setup sequence can be avoided.
Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- t/t9300-fast-import.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index e9c7602..ceb3db3 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -47,8 +47,6 @@ file5_data='an inline file. file6_data='#!/bin/sh echo "$@"' ->empty - ### ### series A ### @@ -2320,12 +2318,12 @@ test_expect_success !MINGW 'R: in-stream cat-blob-fd not respected' ' cat-blob $blob EOF test_cmp expect actual.3 && - test_cmp empty actual.1 && + test_must_be_empty actual.1 && git fast-import 3>actual.3 >actual.1 <<-EOF && option cat-blob-fd=3 cat-blob $blob EOF - test_cmp empty actual.3 && + test_must_be_empty actual.3 && test_cmp expect actual.1 ' @@ -2549,7 +2547,7 @@ EOF test_expect_success 'R: quiet option results in no stats being output' ' cat input | git fast-import 2> output && - test_cmp empty output + test_must_be_empty output ' test_expect_success 'R: feature done means terminating "done" is mandatory' '
-- 2.6.2.337.ga235d84