t3600: use helpers to replace test -d/f/e/s <path>

Take advantage of helper functions test_path_is_dir(),
test_path_is_missing(), etc. to replace `test -d|f|e|s` since the
functions make the code more readable and have better error
messages.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 8b03897a65d706eb9e9c91c787fff109c221d6dd..85ae7dc1e4618275413a8b498f43d43f3e0ead92 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -26,7 +26,7 @@ test_expect_success FUNNYNAMES 'add files with funny names' '
 '
 
 test_expect_success 'Pre-check that foo exists and is in index before git rm foo' '
 '
 
 test_expect_success 'Pre-check that foo exists and is in index before git rm foo' '

-       test -f foo &&
+       test_path_is_file foo &&

        git ls-files --error-unmatch foo
 '
 
        git ls-files --error-unmatch foo
 '
 


@@ -69,12 +69,12 @@ test_expect_success 'Test that git rm --cached -f foo works in case where --cach
 '
 
 test_expect_success 'Post-check that foo exists but is not in index after git rm foo' '
 '
 
 test_expect_success 'Post-check that foo exists but is not in index after git rm foo' '

-       test -f foo &&
+       test_path_is_file foo &&

        test_must_fail git ls-files --error-unmatch foo
 '
 
 test_expect_success 'Pre-check that bar exists and is in index before "git rm bar"' '
        test_must_fail git ls-files --error-unmatch foo
 '
 
 test_expect_success 'Pre-check that bar exists and is in index before "git rm bar"' '

-       test -f bar &&
+       test_path_is_file bar &&

        git ls-files --error-unmatch bar
 '
 
        git ls-files --error-unmatch bar
 '
 


@@ -83,7 +83,7 @@ test_expect_success 'Test that "git rm bar" succeeds' '
 '
 
 test_expect_success 'Post-check that bar does not exist and is not in index after "git rm -f bar"' '
 '
 
 test_expect_success 'Post-check that bar does not exist and is not in index after "git rm -f bar"' '

-       ! test -f bar &&
+       test_path_is_missing bar &&

        test_must_fail git ls-files --error-unmatch bar
 '
 
        test_must_fail git ls-files --error-unmatch bar
 '
 


@@ -138,15 +138,15 @@ test_expect_success 'Re-add foo and baz' '
 test_expect_success 'Modify foo -- rm should refuse' '
        echo >>foo &&
        test_must_fail git rm foo baz &&
 test_expect_success 'Modify foo -- rm should refuse' '
        echo >>foo &&
        test_must_fail git rm foo baz &&

-       test -f foo &&
-       test -f baz &&
+       test_path_is_file foo &&
+       test_path_is_file baz &&

        git ls-files --error-unmatch foo baz
 '
 
 test_expect_success 'Modified foo -- rm -f should work' '
        git rm -f foo baz &&
        git ls-files --error-unmatch foo baz
 '
 
 test_expect_success 'Modified foo -- rm -f should work' '
        git rm -f foo baz &&

-       test ! -f foo &&
-       test ! -f baz &&
+       test_path_is_missing foo &&
+       test_path_is_missing baz &&

        test_must_fail git ls-files --error-unmatch foo &&
        test_must_fail git ls-files --error-unmatch bar
 '
        test_must_fail git ls-files --error-unmatch foo &&
        test_must_fail git ls-files --error-unmatch bar
 '


@@ -160,15 +160,15 @@ test_expect_success 'Re-add foo and baz for HEAD tests' '
 
 test_expect_success 'foo is different in index from HEAD -- rm should refuse' '
        test_must_fail git rm foo baz &&
 
 test_expect_success 'foo is different in index from HEAD -- rm should refuse' '
        test_must_fail git rm foo baz &&

-       test -f foo &&
-       test -f baz &&
+       test_path_is_file foo &&
+       test_path_is_file baz &&

        git ls-files --error-unmatch foo baz
 '
 
 test_expect_success 'but with -f it should work.' '
        git rm -f foo baz &&
        git ls-files --error-unmatch foo baz
 '
 
 test_expect_success 'but with -f it should work.' '
        git rm -f foo baz &&

-       test ! -f foo &&
-       test ! -f baz &&
+       test_path_is_missing foo &&
+       test_path_is_missing baz &&

        test_must_fail git ls-files --error-unmatch foo &&
        test_must_fail git ls-files --error-unmatch baz
 '
        test_must_fail git ls-files --error-unmatch foo &&
        test_must_fail git ls-files --error-unmatch baz
 '


@@ -195,21 +195,21 @@ test_expect_success 'Recursive test setup' '
 
 test_expect_success 'Recursive without -r fails' '
        test_must_fail git rm frotz &&
 
 test_expect_success 'Recursive without -r fails' '
        test_must_fail git rm frotz &&

-       test -d frotz &&
-       test -f frotz/nitfol
+       test_path_is_dir frotz &&
+       test_path_is_file frotz/nitfol

 '
 
 test_expect_success 'Recursive with -r but dirty' '
        echo qfwfq >>frotz/nitfol &&
        test_must_fail git rm -r frotz &&
 '
 
 test_expect_success 'Recursive with -r but dirty' '
        echo qfwfq >>frotz/nitfol &&
        test_must_fail git rm -r frotz &&

-       test -d frotz &&
-       test -f frotz/nitfol
+       test_path_is_dir frotz &&
+       test_path_is_file frotz/nitfol

 '
 
 test_expect_success 'Recursive with -r -f' '
        git rm -f -r frotz &&
 '
 
 test_expect_success 'Recursive with -r -f' '
        git rm -f -r frotz &&

-       ! test -f frotz/nitfol &&
-       ! test -d frotz
+       test_path_is_missing frotz/nitfol &&
+       test_path_is_missing frotz

 '
 
 test_expect_success 'Remove nonexistent file returns nonzero exit status' '
 '
 
 test_expect_success 'Remove nonexistent file returns nonzero exit status' '


@@ -236,7 +236,7 @@ test_expect_success 'refresh index before checking if it is up-to-date' '
        git reset --hard &&
        test-tool chmtime -86400 frotz/nitfol &&
        git rm frotz/nitfol &&
        git reset --hard &&
        test-tool chmtime -86400 frotz/nitfol &&
        git rm frotz/nitfol &&

-       test ! -f frotz/nitfol
+       test_path_is_missing frotz/nitfol

 '
 
 test_expect_success 'choking "git rm" should not let it die with cruft' '
 '
 
 test_expect_success 'choking "git rm" should not let it die with cruft' '


@@ -257,7 +257,7 @@ test_expect_success 'rm removes subdirectories recursively' '
        echo content >dir/subdir/subsubdir/file &&
        git add dir/subdir/subsubdir/file &&
        git rm -f dir/subdir/subsubdir/file &&
        echo content >dir/subdir/subsubdir/file &&
        git add dir/subdir/subsubdir/file &&
        git rm -f dir/subdir/subsubdir/file &&

-       ! test -d dir
+       test_path_is_missing dir

 '
 
 cat >expect <<EOF
 '
 
 cat >expect <<EOF


@@ -295,7 +295,7 @@ test_expect_success 'rm removes empty submodules from work tree' '
        git add .gitmodules &&
        git commit -m "add submodule" &&
        git rm submod &&
        git add .gitmodules &&
        git commit -m "add submodule" &&
        git rm submod &&

-       test ! -e submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&


@@ -317,7 +317,7 @@ test_expect_success 'rm removes work tree of unmodified submodules' '
        git reset --hard &&
        git submodule update &&
        git rm submod &&
        git reset --hard &&
        git submodule update &&
        git rm submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&


@@ -328,7 +328,7 @@ test_expect_success 'rm removes a submodule with a trailing /' '
        git reset --hard &&
        git submodule update &&
        git rm submod/ &&
        git reset --hard &&
        git submodule update &&
        git rm submod/ &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -346,12 +346,12 @@ test_expect_success 'rm of a populated submodule with different HEAD fails unles
        git submodule update &&
        git -C submod checkout HEAD^ &&
        test_must_fail git rm submod &&
        git submodule update &&
        git -C submod checkout HEAD^ &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified actual &&
        git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified actual &&
        git rm -f submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&


@@ -362,8 +362,8 @@ test_expect_success 'rm --cached leaves work tree of populated submodules and .g
        git reset --hard &&
        git submodule update &&
        git rm --cached submod &&
        git reset --hard &&
        git submodule update &&
        git rm --cached submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno >actual &&
        test_cmp expect.cached actual &&
        git config -f .gitmodules submodule.sub.url &&
        git status -s -uno >actual &&
        test_cmp expect.cached actual &&
        git config -f .gitmodules submodule.sub.url &&


@@ -374,7 +374,7 @@ test_expect_success 'rm --dry-run does not touch the submodule or .gitmodules' '
        git reset --hard &&
        git submodule update &&
        git rm -n submod &&
        git reset --hard &&
        git submodule update &&
        git rm -n submod &&

-       test -f submod/.git &&
+       test_path_is_file submod/.git &&

        git diff-index --exit-code HEAD
 '
 
        git diff-index --exit-code HEAD
 '
 


@@ -384,8 +384,8 @@ test_expect_success 'rm does not complain when no .gitmodules file is found' '
        git rm .gitmodules &&
        git rm submod >actual 2>actual.err &&
        test_must_be_empty actual.err &&
        git rm .gitmodules &&
        git rm submod >actual 2>actual.err &&
        test_must_be_empty actual.err &&

-       ! test -d submod &&
-       ! test -f submod/.git &&
+       test_path_is_missing submod &&
+       test_path_is_missing submod/.git &&

        git status -s -uno >actual &&
        test_cmp expect.both_deleted actual
 '
        git status -s -uno >actual &&
        test_cmp expect.both_deleted actual
 '


@@ -395,15 +395,15 @@ test_expect_success 'rm will error out on a modified .gitmodules file unless sta
        git submodule update &&
        git config -f .gitmodules foo.bar true &&
        test_must_fail git rm submod >actual 2>actual.err &&
        git submodule update &&
        git config -f .gitmodules foo.bar true &&
        test_must_fail git rm submod >actual 2>actual.err &&

-       test -s actual.err &&
-       test -d submod &&
-       test -f submod/.git &&
+       test_file_not_empty actual.err &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git diff-files --quiet -- submod &&
        git add .gitmodules &&
        git rm submod >actual 2>actual.err &&
        test_must_be_empty actual.err &&
        git diff-files --quiet -- submod &&
        git add .gitmodules &&
        git rm submod >actual 2>actual.err &&
        test_must_be_empty actual.err &&

-       ! test -d submod &&
-       ! test -f submod/.git &&
+       test_path_is_missing submod &&
+       test_path_is_missing submod/.git &&

        git status -s -uno >actual &&
        test_cmp expect actual
 '
        git status -s -uno >actual &&
        test_cmp expect actual
 '


@@ -416,8 +416,8 @@ test_expect_success 'rm issues a warning when section is not found in .gitmodule
        echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
        git rm submod >actual 2>actual.err &&
        test_i18ncmp expect.err actual.err &&
        echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
        git rm submod >actual 2>actual.err &&
        test_i18ncmp expect.err actual.err &&

-       ! test -d submod &&
-       ! test -f submod/.git &&
+       test_path_is_missing submod &&
+       test_path_is_missing submod/.git &&

        git status -s -uno >actual &&
        test_cmp expect actual
 '
        git status -s -uno >actual &&
        test_cmp expect actual
 '


@@ -427,12 +427,12 @@ test_expect_success 'rm of a populated submodule with modifications fails unless
        git submodule update &&
        echo X >submod/empty &&
        test_must_fail git rm submod &&
        git submodule update &&
        echo X >submod/empty &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_inside actual &&
        git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_inside actual &&
        git rm -f submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -442,12 +442,12 @@ test_expect_success 'rm of a populated submodule with untracked files fails unle
        git submodule update &&
        echo X >submod/untracked &&
        test_must_fail git rm submod &&
        git submodule update &&
        echo X >submod/untracked &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_untracked actual &&
        git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_untracked actual &&
        git rm -f submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -484,7 +484,7 @@ test_expect_success 'rm removes work tree of unmodified conflicted submodule' '
        git submodule update &&
        test_must_fail git merge conflict2 &&
        git rm submod &&
        git submodule update &&
        test_must_fail git merge conflict2 &&
        git rm submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -496,12 +496,12 @@ test_expect_success 'rm of a conflicted populated submodule with different HEAD
        git -C submod checkout HEAD^ &&
        test_must_fail git merge conflict2 &&
        test_must_fail git rm submod &&
        git -C submod checkout HEAD^ &&
        test_must_fail git merge conflict2 &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        git rm -f submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&


@@ -515,12 +515,12 @@ test_expect_success 'rm of a conflicted populated submodule with modifications f
        echo X >submod/empty &&
        test_must_fail git merge conflict2 &&
        test_must_fail git rm submod &&
        echo X >submod/empty &&
        test_must_fail git merge conflict2 &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        git rm -f submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual &&
        test_must_fail git config -f .gitmodules submodule.sub.url &&


@@ -534,12 +534,12 @@ test_expect_success 'rm of a conflicted populated submodule with untracked files
        echo X >submod/untracked &&
        test_must_fail git merge conflict2 &&
        test_must_fail git rm submod &&
        echo X >submod/untracked &&
        test_must_fail git merge conflict2 &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        git rm -f submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -556,13 +556,13 @@ test_expect_success 'rm of a conflicted populated submodule with a .git director
        ) &&
        test_must_fail git merge conflict2 &&
        test_must_fail git rm submod &&
        ) &&
        test_must_fail git merge conflict2 &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -d submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_dir submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        test_must_fail git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        test_must_fail git rm -f submod &&

-       test -d submod &&
-       test -d submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_dir submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        git merge --abort &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.conflict actual &&
        git merge --abort &&


@@ -574,7 +574,7 @@ test_expect_success 'rm of a conflicted unpopulated submodule succeeds' '
        git reset --hard &&
        test_must_fail git merge conflict2 &&
        git rm submod &&
        git reset --hard &&
        test_must_fail git merge conflict2 &&
        git rm submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -591,10 +591,10 @@ test_expect_success 'rm of a populated submodule with a .git directory migrates
                rm -r ../.git/modules/sub
        ) &&
        git rm submod 2>output.err &&
                rm -r ../.git/modules/sub
        ) &&
        git rm submod 2>output.err &&

-       ! test -d submod &&
-       ! test -d submod/.git &&
+       test_path_is_missing submod &&
+       test_path_is_missing submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        git status -s -uno --ignore-submodules=none >actual &&

-       test -s actual &&
+       test_file_not_empty actual &&

        test_i18ngrep Migrating output.err
 '
 
        test_i18ngrep Migrating output.err
 '
 


@@ -620,7 +620,7 @@ test_expect_success 'setup subsubmodule' '
 
 test_expect_success 'rm recursively removes work tree of unmodified submodules' '
        git rm submod &&
 
 test_expect_success 'rm recursively removes work tree of unmodified submodules' '
        git rm submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -630,12 +630,12 @@ test_expect_success 'rm of a populated nested submodule with different nested HE
        git submodule update --recursive &&
        git -C submod/subsubmod checkout HEAD^ &&
        test_must_fail git rm submod &&
        git submodule update --recursive &&
        git -C submod/subsubmod checkout HEAD^ &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_inside actual &&
        git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_inside actual &&
        git rm -f submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -645,12 +645,12 @@ test_expect_success 'rm of a populated nested submodule with nested modification
        git submodule update --recursive &&
        echo X >submod/subsubmod/empty &&
        test_must_fail git rm submod &&
        git submodule update --recursive &&
        echo X >submod/subsubmod/empty &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_inside actual &&
        git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_inside actual &&
        git rm -f submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -660,12 +660,12 @@ test_expect_success 'rm of a populated nested submodule with nested untracked fi
        git submodule update --recursive &&
        echo X >submod/subsubmod/untracked &&
        test_must_fail git rm submod &&
        git submodule update --recursive &&
        echo X >submod/subsubmod/untracked &&
        test_must_fail git rm submod &&

-       test -d submod &&
-       test -f submod/.git &&
+       test_path_is_dir submod &&
+       test_path_is_file submod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_untracked actual &&
        git rm -f submod &&
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect.modified_untracked actual &&
        git rm -f submod &&

-       test ! -d submod &&
+       test_path_is_missing submod &&

        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '
        git status -s -uno --ignore-submodules=none >actual &&
        test_cmp expect actual
 '


@@ -680,10 +680,10 @@ test_expect_success "rm absorbs submodule's nested .git directory" '
                GIT_WORK_TREE=. git config --unset core.worktree
        ) &&
        git rm submod 2>output.err &&
                GIT_WORK_TREE=. git config --unset core.worktree
        ) &&
        git rm submod 2>output.err &&

-       ! test -d submod &&
-       ! test -d submod/subsubmod/.git &&
+       test_path_is_missing submod &&
+       test_path_is_missing submod/subsubmod/.git &&

        git status -s -uno --ignore-submodules=none >actual &&
        git status -s -uno --ignore-submodules=none >actual &&

-       test -s actual &&
+       test_file_not_empty actual &&

        test_i18ngrep Migrating output.err
 '
 
        test_i18ngrep Migrating output.err
 '