Skip to content

Commit 866ea87

Browse files
matteobagnolinigitster
authored andcommitted
t7110: replace test -f with test_path_is_* helpers
`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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1b4e9a5 commit 866ea87

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t7110-reset-merge.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,22 +270,22 @@ test_expect_success '--merge is ok with added/deleted merge' '
270270
git reset --hard third &&
271271
rm -f file2 &&
272272
test_must_fail git merge branch3 &&
273-
! test -f file2 &&
274-
test -f file3 &&
273+
test_path_is_missing file2 &&
274+
test_path_is_file file3 &&
275275
git diff --exit-code file3 &&
276276
git diff --exit-code branch3 file3 &&
277277
git reset --merge HEAD &&
278-
! test -f file3 &&
279-
! test -f file2 &&
278+
test_path_is_missing file3 &&
279+
test_path_is_missing file2 &&
280280
git diff --exit-code --cached
281281
'
282282

283283
test_expect_success '--keep fails with added/deleted merge' '
284284
git reset --hard third &&
285285
rm -f file2 &&
286286
test_must_fail git merge branch3 &&
287-
! test -f file2 &&
288-
test -f file3 &&
287+
test_path_is_missing file2 &&
288+
test_path_is_file file3 &&
289289
git diff --exit-code file3 &&
290290
git diff --exit-code branch3 file3 &&
291291
test_must_fail git reset --keep HEAD 2>err.log &&

0 commit comments

Comments
 (0)