summaryrefslogtreecommitdiff
path: root/t/t3600-rm.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-27 21:33:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-27 21:33:43 (GMT)
commit986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a (patch)
tree4ef3f9805cfdbf3b4496cb720a94c138df034204 /t/t3600-rm.sh
parentfc0df933c8fa09603a9e9798085ee07ca1a83f65 (diff)
parent1c5e94f459a0b7c23ef7e855441a65afdc4effab (diff)
downloadgit-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.zip
git-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.tar.gz
git-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.tar.bz2
Merge branch 'sg/test-must-be-empty'
Test fixes. * sg/test-must-be-empty: tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>' tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>' tests: use 'test_must_be_empty' instead of 'test ! -s' tests: use 'test_must_be_empty' instead of '! test -s'
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-xt/t3600-rm.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 5829dfd..04e5d42 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -380,7 +380,7 @@ test_expect_success 'rm does not complain when no .gitmodules file is found' '
git submodule update &&
git rm .gitmodules &&
git rm submod >actual 2>actual.err &&
- ! test -s actual.err &&
+ test_must_be_empty actual.err &&
! test -d submod &&
! test -f submod/.git &&
git status -s -uno >actual &&
@@ -398,7 +398,7 @@ test_expect_success 'rm will error out on a modified .gitmodules file unless sta
git diff-files --quiet -- submod &&
git add .gitmodules &&
git rm submod >actual 2>actual.err &&
- ! test -s actual.err &&
+ test_must_be_empty actual.err &&
! test -d submod &&
! test -f submod/.git &&
git status -s -uno >actual &&
@@ -692,7 +692,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual
test_cmp expected actual &&
rm -rf submod &&
git status -s -uno --ignore-submodules=none >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'rm of d/f when d has become a non-directory' '