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>
Shourya Shukla committed
Jan 18, 2020 at 14:03 UTC
c513a958b69090c02ad422b0cd4622009bb4b9f5
1 file changed
+3
-3
t/t6025-merge-symlinks.sh
+3
-3
@@ -36,7 +36,7 @@ test_expect_success 'merge master into b-symlink, which has a different symbolic
36
'
37
38
test_expect_success 'the merge result must be a file' '
39
- test -f symlink
39
+ test_path_is_file symlink
40
'
41
42
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
46
'
47
48
test_expect_success 'the merge result must be a file' '
49
- test -f symlink
49
+ test_path_is_file symlink
50
'
51
52
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,
56
'
57
58
test_expect_success 'the merge result must be a file' '
59
- test -f symlink
59
+ test_path_is_file symlink
60
'
61
62
test_done