summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2015-11-19 20:09:45 +0100
committerLibravatar Jeff King <peff@peff.net>2015-11-20 08:02:06 -0500
commitacf3af25fbc8b2323ab210e0b63abcb912bd7def (patch)
tree685b027e0ae05d2826aa039b10b536199b9ddd99
parentmodernize t9300: use test_must_fail (diff)
downloadtgif-acf3af25fbc8b2323ab210e0b63abcb912bd7def.tar.xz
modernize t9300: use test_must_be_empty
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> Signed-off-by: Jeff King <peff@peff.net>
-rwxr-xr-xt/t9300-fast-import.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index e9c7602849..ceb3db3100 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' '