test: test_must_be_empty helper
There are quite a lot places where an output file is expected to be
empty, and we fail the test when it is not. The output from running
the test script with -i -v can be helped if we showed the unexpected
contents at that point.
We could of course do
>expected.empty && test_cmp expected.empty actual
but this is commmon enough to be done with a dedicated helper.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@ -78,7 +78,7 @@ test_expect_success 'submodule add' '
|
||||
(
|
||||
cd addtest &&
|
||||
git submodule add -q "$submodurl" submod >actual &&
|
||||
test ! -s actual &&
|
||||
test_must_be_empty actual &&
|
||||
echo "gitdir: ../.git/modules/submod" >expect &&
|
||||
test_cmp expect submod/.git &&
|
||||
(
|
||||
@ -308,7 +308,7 @@ test_expect_success 'update should work when path is an empty dir' '
|
||||
|
||||
mkdir init &&
|
||||
git submodule update -q >update.out &&
|
||||
test ! -s update.out &&
|
||||
test_must_be_empty update.out &&
|
||||
|
||||
inspect init &&
|
||||
test_cmp expect head-sha1
|
||||
@ -696,7 +696,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
|
||||
rm -rf repo &&
|
||||
git rm repo &&
|
||||
git submodule add -q --name repo_new "$submodurl/bare.git" repo >actual &&
|
||||
test ! -s actual &&
|
||||
test_must_be_empty actual &&
|
||||
echo "gitdir: ../.git/modules/submod" >expect &&
|
||||
test_cmp expect submod/.git &&
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user