[PATCH v3] t5300: modernize test path checks in t5300
Replace `test -f` commands with `test_path_is_file`, because it makes debugging a failing test easier by reporting what expectation was not met.
Signed-off-by: Ogundipe Sola Taiwo <ogundipesolataiwo12@gmail.com>
---
Changes in v3:
- Rephrase patch summary to state how the use of `test_path_is_file`
improves the debugging of failing tests.
t/t5300-pack-object.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index aac139e6a0..e5ce478484 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -283,11 +283,11 @@ test_expect_success 'survive missing objects/pack directory' '
GOP=.git/objects/pack &&
rm -fr $GOP &&
git index-pack --stdin --keep=test <../test-3-${packname_3}.pack &&
- test -f $GOP/pack-${packname_3}.pack &&
+ test_path_is_file $GOP/pack-${packname_3}.pack &&
cmp $GOP/pack-${packname_3}.pack ../test-3-${packname_3}.pack &&
- test -f $GOP/pack-${packname_3}.idx &&
+ test_path_is_file $GOP/pack-${packname_3}.idx &&
cmp $GOP/pack-${packname_3}.idx ../test-3-${packname_3}.idx &&
- test -f $GOP/pack-${packname_3}.keep
+ test_path_is_file $GOP/pack-${packname_3}.keep
)
'
@@ -376,7 +376,7 @@ test_expect_success 'build pack index for an existing pack' '
rm -f test-4.keep &&
git index-pack --keep=why test-4.pack &&
cmp test-1-${packname_1}.idx test-4.idx &&
- test -f test-4.keep &&
+ test_path_is_file test-4.keep &&
:
'
@@ -616,7 +616,7 @@ test_expect_success 'setup: fake a SHA1 hash collision' '
cd corrupt &&
long_a=$(git hash-object -w ../a | sed -e "s!^..!&/!") &&
long_b=$(git hash-object -w ../b | sed -e "s!^..!&/!") &&
- test -f .git/objects/$long_b &&
+ test_path_is_file .git/objects/$long_b &&
cp -f .git/objects/$long_a \
.git/objects/$long_b
)
Range-diff against v2:
1: ca6cd5870e ! 1: bbce4f6440 t5300: modernize test path checks in t5300
@@ Metadata
## Commit message ##
t5300: modernize test path checks in t5300
- Improves test t5300-pack-object by converting old-style
- path checks to use the `test_path_is_file` helper function.
+ Replace `test -f` commands with `test_path_is_file`, because
+ it makes debugging a failing test easier by reporting what
+ expectation was not met.
Signed-off-by: Ogundipe Sola Taiwo <ogundipesolataiwo12@gmail.com>
--
2.56.0.116.g6de20f6092.dirty