git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 3/3] t6025: use helpers to replace test -f <path>

From
Shourya Shukla <shouryashukla.oo@gmail.com>
Date
Jan 17, 2020, 20:44 UTC
Message-ID
<20200117204426.9347-4-shouryashukla.oo@gmail.com>
In-Reply-To
<20200117204426.9347-1-shouryashukla.oo@gmail.com>

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>
---
 t/t6025-merge-symlinks.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
index 5136bf1e13..18a204bb65 100755
--- a/t/t6025-merge-symlinks.sh
+++ b/t/t6025-merge-symlinks.sh
@@ -37,7 +37,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' '
@@ -47,7 +47,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' '
@@ -57,7 +57,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

-- 
2.20.1
Previous: Junio C HamanoNext: Johannes Schindelin
Message 23 of 24 in “t6025: updating tests”
  1. 0/3 t6025: updating testsShourya Shukla, Jan 16, 2020
  2. 1/3 t6025: modernize styleShourya Shukla, Jan 16, 2020
  3. Johannes SchindelinJan 16, 2020
  4. 2/3 t6025: replace pipe with redirection operatorShourya Shukla, Jan 16, 2020
  5. Junio C HamanoJan 16, 2020
  6. 3/3 t6025: use helpers to replace test -f <path>Shourya Shukla, Jan 16, 2020
  7. Junio C HamanoJan 16, 2020
  8. 0/3 t6025: amended changes after suggestions from the communityShourya Shukla, Jan 17, 2020
  9. 1/3 t6025: modernize styleShourya Shukla, Jan 17, 2020
  10. Eric SunshineJan 17, 2020
  11. Junio C HamanoJan 17, 2020
  12. 2/3 t6025: replace pipe with redirection operatorShourya Shukla, Jan 17, 2020
  13. Eric SunshineJan 17, 2020
  14. 0/3 t6025: updating testsShourya Shukla, Jan 18, 2020
  15. 1/3 t6025: modernize styleShourya Shukla, Jan 18, 2020
  16. 2/3 t6025: replace pipe with redirection operatorShourya Shukla, Jan 18, 2020
  17. 3/3 t6025: use helpers to replace test -f <path>Shourya Shukla, Jan 18, 2020
  18. 0/2 t025: amended changes after suggestions from the communityShourya Shukla, Jan 18, 2020
  19. 1/2 t6025: modernize styleShourya Shukla, Jan 18, 2020
  20. Junio C HamanoJan 21, 2020
  21. 2/2 t6025: use helpers to replace test -f <path>Shourya Shukla, Jan 18, 2020
  22. Junio C HamanoJan 21, 2020
  23. 3/3 t6025: use helpers to replace test -f <path>Shourya Shukla, Jan 17, 2020
  24. Johannes SchindelinJan 16, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.