Skip to contentSkip to conversation

t5301: use test_path_is_file instead of test -f

PATCH In review Roger Koranteng via GitGitGadget 2 participants 2 messages Oct 20 – Oct 21

lore
Share & tools
lore

Roger Koranteng via GitGitGadget

author
#0 lore raw

PATCH 1/1 t5301: use test_path_is_file instead of test -f

From: Roger Koranteng <[email protected]>

Replace raw 'test -f' assertions with the 'test_path_is_file' helper, which gives diagnostic output when the assertion fails.

Signed-off-by Roger Koranteng <[email protected]>

---
t5301: use test_path_is_file instead of test -f

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2269%2Frogerkorantenng%2Ft5301-modernize-path-checks-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2269/rogerkorantenng/t5301-modernize-path-checks-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2269

 t/t5301-sliding-window.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
t/t5301-sliding-window.sh +2 -2
index 3c3666b278..b6868229bf 100755
@@ -22,7 +22,7 @@ test_expect_success 'setup' '
 	git repack -a -d &&
 	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
 	pack1=$(ls .git/objects/pack/*.pack) &&
-	test -f "$pack1"
+	test_path_is_file "$pack1"
 '
 
 test_expect_success 'verify-pack -v, defaults' '

@@ -48,7 +48,7 @@ test_expect_success 'repack -a -d, packedGit{WindowSize,Limit} == 1 page' '
 	git repack -a -d &&
 	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
 	pack2=$(ls .git/objects/pack/*.pack) &&
-	test -f "$pack2" &&
+	test_path_is_file "$pack2" &&
 	test "$pack1" \!= "$pack2"
 '

base-commit: c51408889c3b372814bc20b9431c3b74d0d268eb

Signature · 1 line
gitgitgadget
#1 lore raw
Quoted 21 lines · Roger Koranteng via GitGitGadget

From: Roger Koranteng <[email protected]>

Replace raw 'test -f' assertions with the 'test_path_is_file' helper, which gives diagnostic output when the assertion fails.

Signed-off-by Roger Koranteng <[email protected]>

---
t5301: use test_path_is_file instead of test -f

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2269%2Frogerkorantenng%2Ft5301-modernize-path-checks-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2269/rogerkorantenng/t5301-modernize-path-checks-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2269

 t/t5301-sliding-window.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
t/t5301-sliding-window.sh +0 -0
index 3c3666b278..b6868229bf 100755

t/t5301-sliding-window.sh test_expect_success 'setup' ' · line 26

Quoted 6 lines
t/t5301-sliding-window.sh +1 -1
@@ -22,7 +22,7 @@ test_expect_success 'setup' '
 	git repack -a -d &&
 	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
 	pack1=$(ls .git/objects/pack/*.pack) &&
-	test -f "$pack1"
+	test_path_is_file "$pack1"
 '

OK.

t/t5301-sliding-window.sh test_expect_success 'repack -a -d, packedGit{WindowSize,Limit} == 1 page' ' · line 51

Quoted 7 lines
t/t5301-sliding-window.sh +1 -1
 test_expect_success 'verify-pack -v, defaults' '

@@ -48,7 +48,7 @@ test_expect_success 'repack -a -d, packedGit{WindowSize,Limit} == 1 page' '
 	git repack -a -d &&
 	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
 	pack2=$(ls .git/objects/pack/*.pack) &&
-	test -f "$pack2" &&
+	test_path_is_file "$pack2" &&

OK.

t/t5301-sliding-window.sh test_expect_success 'repack -a -d, packedGit{WindowSize,Limit} == 1 page' ' · line 53

Quoted 2 lines
t/t5301-sliding-window.sh +0 -0
 	test "$pack1" \!= "$pack2"
 '

This is an existing wart but we shouldn't quote letters that we do not have to quote like this. It gives a wrong hint to readers that something fishy might be going on and distracts them. We may want to have a separate job to find warts in tests similar to this one and eradicate them all, but that is totally outside the scope of this patch.

Looking good to me.