From: Yuvraj Singh Chauhan <ysinghcin@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Yuvraj Singh Chauhan <ysinghcin@gmail.com>
Subject: [PATCH 2/2] t7412: modernize path checks to use test helper functions
Date: Tue, 3 Mar 2026 23:27:50 +0530 [thread overview]
Message-ID: <20260303175750.361563-2-ysinghcin@gmail.com> (raw)
In-Reply-To: <20260303175750.361563-1-ysinghcin@gmail.com>
Replace 11 raw 'test -f', 'test -d', and '! test -e' calls with the
corresponding test library helpers:
- 'test -f' -> 'test_path_is_file'
- 'test -d' -> 'test_path_is_dir'
- '! test -e' -> 'test_path_is_missing'
These helpers emit a descriptive message on failure,
making failing tests easier to diagnose than the silent
pass/fail of the raw shell primitives.
Signed-off-by: Yuvraj Singh Chauhan <ysinghcin@gmail.com>
---
t/t7412-submodule-absorbgitdirs.sh | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/t/t7412-submodule-absorbgitdirs.sh b/t/t7412-submodule-absorbgitdirs.sh
index 41ee035e3c..cdc7f59e12 100755
--- a/t/t7412-submodule-absorbgitdirs.sh
+++ b/t/t7412-submodule-absorbgitdirs.sh
@@ -34,8 +34,8 @@ test_expect_success 'absorb the git dir' '
git submodule absorbgitdirs 2>actual &&
test_cmp expect actual &&
git fsck &&
- test -f sub1/.git &&
- test -d .git/modules/sub1 &&
+ test_path_is_file sub1/.git &&
+ test_path_is_dir .git/modules/sub1 &&
git status >actual.1 &&
git -C sub1 rev-parse HEAD >actual.2 &&
test_cmp expect.1 actual.1 &&
@@ -47,9 +47,9 @@ test_expect_success 'absorbing does not fail for deinitialized submodules' '
git submodule deinit --all &&
git submodule absorbgitdirs 2>err &&
test_must_be_empty err &&
- test -d .git/modules/sub1 &&
- test -d sub1 &&
- ! test -e sub1/.git
+ test_path_is_dir .git/modules/sub1 &&
+ test_path_is_dir sub1 &&
+ test_path_is_missing sub1/.git
'
test_expect_success 'setup nested submodule' '
@@ -72,8 +72,8 @@ test_expect_success 'absorb the git dir in a nested submodule' '
EOF
git submodule absorbgitdirs 2>actual &&
test_cmp expect actual &&
- test -f sub1/nested/.git &&
- test -d .git/modules/sub1/modules/nested &&
+ test_path_is_file sub1/nested/.git &&
+ test_path_is_dir .git/modules/sub1/modules/nested &&
git status >actual.1 &&
git -C sub1/nested rev-parse HEAD >actual.2 &&
test_cmp expect.1 actual.1 &&
@@ -109,9 +109,9 @@ test_expect_success 'absorb the git dir in a nested submodule' '
EOF
git submodule absorbgitdirs 2>actual &&
test_cmp expect actual &&
- test -f sub1/.git &&
- test -f sub1/nested/.git &&
- test -d .git/modules/sub1/modules/nested &&
+ test_path_is_file sub1/.git &&
+ test_path_is_file sub1/nested/.git &&
+ test_path_is_dir .git/modules/sub1/modules/nested &&
git status >actual.1 &&
git -C sub1/nested rev-parse HEAD >actual.2 &&
test_cmp expect.1 actual.1 &&
@@ -155,7 +155,7 @@ test_expect_success 'absorbing the git dir fails for incomplete submodules' '
test_must_fail git submodule absorbgitdirs 2>actual &&
test_cmp expect actual &&
git -C sub2 fsck &&
- test -d sub2/.git &&
+ test_path_is_dir sub2/.git &&
git status >actual &&
git -C sub2 rev-parse HEAD >actual.2 &&
test_cmp expect.1 actual.1 &&
--
2.53.0.290.g4805bb9930
next prev parent reply other threads:[~2026-03-03 17:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-03 17:57 [PATCH 1/2] t7412: fix typo 'submodue' in test_description Yuvraj Singh Chauhan
2026-03-03 17:57 ` Yuvraj Singh Chauhan [this message]
2026-03-04 5:16 ` [PATCH 2/2] t7412: modernize path checks to use test helper functions Patrick Steinhardt
2026-03-04 5:16 ` [PATCH 1/2] t7412: fix typo 'submodue' in test_description Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260303175750.361563-2-ysinghcin@gmail.com \
--to=ysinghcin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox