t2401: update path checks using test_path helpers

Update old-style shell path checks to use the modern test
helpers 'test_path_is_file' and 'test_path_is_dir' for improved
runtime diagnosis.

Signed-off-by: Solly <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>

diff --git a/t/t2401-worktree-prune.sh b/t/t2401-worktree-prune.sh
index fe671d4..f8f28c7 100755 (executable)
--- a/t/t2401-worktree-prune.sh
+++ b/t/t2401-worktree-prune.sh
@@ -24,8 +24,8 @@ test_expect_success 'prune files inside $GIT_DIR/worktrees' '
 Removing worktrees/abc: not a valid directory
 EOF
        test_cmp expect actual &&
-       ! test -f .git/worktrees/abc &&
-       ! test -d .git/worktrees
+       test_path_is_missing .git/worktrees/abc &&
+       test_path_is_missing .git/worktrees
 '
 
 test_expect_success 'prune directories without gitdir' '
@@ -36,8 +36,8 @@ Removing worktrees/def: gitdir file does not exist
 EOF
        git worktree prune --verbose 2>actual &&
        test_cmp expect actual &&
-       ! test -d .git/worktrees/def &&
-       ! test -d .git/worktrees
+       test_path_is_missing .git/worktrees/def &&
+       test_path_is_missing .git/worktrees
 '
 
 test_expect_success SANITY 'prune directories with unreadable gitdir' '
@@ -47,8 +47,8 @@ test_expect_success SANITY 'prune directories with unreadable gitdir' '
        chmod u-r .git/worktrees/def/gitdir &&
        git worktree prune --verbose 2>actual &&
        test_grep "Removing worktrees/def: unable to read gitdir file" actual &&
-       ! test -d .git/worktrees/def &&
-       ! test -d .git/worktrees
+       test_path_is_missing .git/worktrees/def &&
+       test_path_is_missing .git/worktrees
 '
 
 test_expect_success 'prune directories with invalid gitdir' '
@@ -57,8 +57,8 @@ test_expect_success 'prune directories with invalid gitdir' '
        : >.git/worktrees/def/gitdir &&
        git worktree prune --verbose 2>actual &&
        test_grep "Removing worktrees/def: invalid gitdir file" actual &&
-       ! test -d .git/worktrees/def &&
-       ! test -d .git/worktrees
+       test_path_is_missing .git/worktrees/def &&
+       test_path_is_missing .git/worktrees
 '
 
 test_expect_success 'prune directories with gitdir pointing to nowhere' '
@@ -67,8 +67,8 @@ test_expect_success 'prune directories with gitdir pointing to nowhere' '
        echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
        git worktree prune --verbose 2>actual &&
        test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
-       ! test -d .git/worktrees/def &&
-       ! test -d .git/worktrees
+       test_path_is_missing .git/worktrees/def &&
+       test_path_is_missing .git/worktrees
 '
 
 test_expect_success 'not prune locked checkout' '
@@ -76,23 +76,23 @@ test_expect_success 'not prune locked checkout' '
        mkdir -p .git/worktrees/ghi &&
        : >.git/worktrees/ghi/locked &&
        git worktree prune &&
-       test -d .git/worktrees/ghi
+       test_path_is_dir .git/worktrees/ghi
 '
 
 test_expect_success 'not prune recent checkouts' '
        test_when_finished rm -r .git/worktrees &&
        git worktree add jlm HEAD &&
-       test -d .git/worktrees/jlm &&
+       test_path_is_dir .git/worktrees/jlm &&
        rm -rf jlm &&
        git worktree prune --verbose --expire=2.days.ago &&
-       test -d .git/worktrees/jlm
+       test_path_is_dir .git/worktrees/jlm
 '
 
 test_expect_success 'not prune proper checkouts' '
        test_when_finished rm -r .git/worktrees &&
        git worktree add --detach "$PWD/nop" main &&
        git worktree prune &&
-       test -d .git/worktrees/nop
+       test_path_is_dir .git/worktrees/nop
 '
 
 test_expect_success 'prune duplicate (linked/linked)' '
@@ -103,8 +103,8 @@ test_expect_success 'prune duplicate (linked/linked)' '
        mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir &&
        git worktree prune --verbose 2>actual &&
        test_grep "duplicate entry" actual &&
-       test -d .git/worktrees/w1 &&
-       ! test -d .git/worktrees/w2
+       test_path_is_dir .git/worktrees/w1 &&
+       test_path_is_missing .git/worktrees/w2
 '
 
 test_expect_success 'prune duplicate (main/linked)' '
@@ -116,7 +116,7 @@ test_expect_success 'prune duplicate (main/linked)' '
        mv repo wt &&
        git -C wt worktree prune --verbose 2>actual &&
        test_grep "duplicate entry" actual &&
-       ! test -d .git/worktrees/wt
+       test_path_is_missing .git/worktrees/wt
 '
 
 test_expect_success 'not prune proper worktrees inside linked worktree with relative paths' '