t6025: use helpers to replace test -f <path>

Take advantage of helper function 'test_path_is_file()' to
replace 'test -f' since the function makes the code more
readable and gives better error messages.

Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Shourya Shukla 2020-01-18 14:03:26 +05:30 committed by Junio C Hamano
parent 70789843bd
commit c513a958b6

View file

@ -36,7 +36,7 @@ test_expect_success 'merge master into b-symlink, which has a different symbolic
'
test_expect_success 'the merge result must be a file' '
test -f symlink
test_path_is_file symlink
'
test_expect_success 'merge master into b-file, which has a file instead of a symbolic link' '
@ -46,7 +46,7 @@ test_expect_success 'merge master into b-file, which has a file instead of a sym
'
test_expect_success 'the merge result must be a file' '
test -f symlink
test_path_is_file symlink
'
test_expect_success 'merge b-file, which has a file instead of a symbolic link, into master' '
@ -56,7 +56,7 @@ test_expect_success 'merge b-file, which has a file instead of a symbolic link,
'
test_expect_success 'the merge result must be a file' '
test -f symlink
test_path_is_file symlink
'
test_done