t5520: replace test -f with test-lib functions

Although `test -f` has the same functionality as test_path_is_file(), in
the case where test_path_is_file() fails, we get much better debugging
information.

Replace `test -f` with test_path_is_file() so that future developers
will have a better experience debugging these test cases.

Also, in the case of `! test -f`, not only should that path not be a
file, it shouldn't exist at all so replace it with
test_path_is_missing().

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 55560ce3cdce27decbae4cf08c9051f218b34dc1..004d5884cd2a4e76e940e03ca011bd1a70504d97 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -39,8 +39,8 @@ test_expect_success 'pulling into void' '
                cd cloned &&
                git pull ..
        ) &&
-       test -f file &&
-       test -f cloned/file &&
+       test_path_is_file file &&
+       test_path_is_file cloned/file &&
        test_cmp file cloned/file
 '
 
@@ -50,8 +50,8 @@ test_expect_success 'pulling into void using master:master' '
                cd cloned-uho &&
                git pull .. master:master
        ) &&
-       test -f file &&
-       test -f cloned-uho/file &&
+       test_path_is_file file &&
+       test_path_is_file cloned-uho/file &&
        test_cmp file cloned-uho/file
 '
 
@@ -99,7 +99,7 @@ test_expect_success 'pulling into void must not create an octopus' '
        (
                cd cloned-octopus &&
                test_must_fail git pull .. master master &&
-               ! test -f file
+               test_path_is_missing file
        )
 '