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

periperidip · gitster · commit c513a958b690 · 2020-01-21T13:57:42.000-08:00
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 &lt;shouryashukla.oo@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ test_expect_success 'merge master into b-symlink, which has a different symbolic`
`36`	`36`	`'`
`37`	`37`
`38`	`38`	`test_expect_success 'the merge result must be a file' '`
`39`		`- test -f symlink`
	`39`	`+ test_path_is_file symlink`
`40`	`40`	`'`
`41`	`41`
`42`	`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`	`46`	`'`
`47`	`47`
`48`	`48`	`test_expect_success 'the merge result must be a file' '`
`49`		`- test -f symlink`
	`49`	`+ test_path_is_file symlink`
`50`	`50`	`'`
`51`	`51`
`52`	`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`	`56`	`'`
`57`	`57`
`58`	`58`	`test_expect_success 'the merge result must be a file' '`
`59`		`- test -f symlink`
	`59`	`+ test_path_is_file symlink`
`60`	`60`	`'`
`61`	`61`
`62`	`62`	`test_done`