admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

t7110: replace test -f with test_path_is_* helpers

Browse Source 
`test -f` and `! test -f` do not provide clear error messages when they fail.
To enhance debuggability, use `test_path_is_file` and `test_path_is_missing`,
which instead provide more informative error messages.

Note that `! test -f` checks if a path is not a file, while
`test_path_is_missing` verifies that a path does not exist. In this specific
case the tests are meant to check the absence of the path, making
`test_path_is_missing` a valid replacement.

Signed-off-by: Matteo Bagnolini <matteobagnolini2003@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matteo Bagnolini
2025-01-03 14:00:35 +01:00
committed by Junio C Hamano
parent 1b4e9a5f8b
commit 866ea87703
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
t/t7110-reset-merge.sh
View File

@@ -270,13 +270,13 @@ test_expect_success '--merge is ok with added/deleted merge' '
git reset --hard third && git reset --hard third &&
rm -f file2 && rm -f file2 &&
test_must_fail git merge branch3 && test_must_fail git merge branch3 &&
! test -f file2 && test_path_is_missing file2 &&
test -f file3 && test_path_is_file file3 &&
git diff --exit-code file3 && git diff --exit-code file3 &&
git diff --exit-code branch3 file3 && git diff --exit-code branch3 file3 &&
git reset --merge HEAD && git reset --merge HEAD &&
! test -f file3 && test_path_is_missing file3 &&
! test -f file2 && test_path_is_missing file2 &&
git diff --exit-code --cached git diff --exit-code --cached
' '
@@ -284,8 +284,8 @@ test_expect_success '--keep fails with added/deleted merge' '
git reset --hard third && git reset --hard third &&
rm -f file2 && rm -f file2 &&
test_must_fail git merge branch3 && test_must_fail git merge branch3 &&
! test -f file2 && test_path_is_missing file2 &&
test -f file3 && test_path_is_file file3 &&
git diff --exit-code file3 && git diff --exit-code file3 &&
git diff --exit-code branch3 file3 && git diff --exit-code branch3 file3 &&
test_must_fail git reset --keep HEAD 2>err.log && test_must_fail git reset --keep HEAD 2>err.log &&