Skip to contentSkip to conversation

submodule absorbgitdirs tests: use test_* helper functions

PATCH In review Bryan B. Lima 3 participants 4 messages Jun 30 – Jul 27

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 submodule absorbgitdirs tests: use test_* helper functions

Use modern helper functions from test-lib-functions.sh to provide nice error messages.

---
 t/t7412-submodule-absorbgitdirs.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
t/t7412-submodule-absorbgitdirs.sh +11 -11
index 0490499573..bd1c684480 100755
@@ -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 &&

base-commit: e9019fcafe0040228b8631c30f97ae1adb61bcdc

Signature · 1 line
2.54.0
#1 lore raw
Quoted 8 lines · Bryan B. Lima

Use modern helper functions from test-lib-functions.sh to provide nice error messages.

---
 t/t7412-submodule-absorbgitdirs.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Welcome to the Git development community.

It is rare, but it happens from time to time, that we see a patch by somebody we haven't seen on this list, and the patch looks perfect. Very delighted.

Will queue. Thanks.

Quoted 63 lines
t/t7412-submodule-absorbgitdirs.sh +11 -11
index 0490499573..bd1c684480 100755
@@ -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 &&

base-commit: e9019fcafe0040228b8631c30f97ae1adb61bcdc

#2 lore raw
Quoted 4 lines · Junio C Hamano
Quoted 2 lines · Bryan B. Lima

Use modern helper functions from test-lib-functions.sh to provide nice error messages.

Quoted 8 lines
Quoted 6 lines
---
 t/t7412-submodule-absorbgitdirs.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Welcome to the Git development community.

Welcome indeed!

Quoted 3 lines

It is rare, but it happens from time to time, that we see a patch by somebody we haven't seen on this list, and the patch looks perfect. Very delighted.

Sorry to spoil it: the order of SOBs is incorrect. The patch is authored by Bryan, so that signoff needs to come last.

The patch itself looks good though, thanks!

Patrick

#3 lore raw
Quoted 16 lines · Patrick Steinhardt
Quoted 4 lines · Junio C Hamano
Quoted 2 lines · Bryan B. Lima

Use modern helper functions from test-lib-functions.sh to provide nice error messages.

Quoted 8 lines
Quoted 6 lines
---
 t/t7412-submodule-absorbgitdirs.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Welcome to the Git development community.

Welcome indeed!

Quoted 8 lines
Quoted 3 lines

It is rare, but it happens from time to time, that we see a patch by somebody we haven't seen on this list, and the patch looks perfect. Very delighted.

Sorry to spoil it: the order of SOBs is incorrect. The patch is authored by Bryan, so that signoff needs to come last.

The patch itself looks good though, thanks!

This discussion thread has been hanging for a while after we saw this message. To help a new participant, here are a few tips.

* These discussions can be seen on mail archives. On the primary archive, the message I am responding to appears here:

https://lore.kernel.org/git/[email protected]/

For any discussion you are interested in, replace the URL path with the Message-Id of the message that is part of the discussion. For example, after sending a patch, you use the message ID of the patch message you sent out and by visiting the page there, you see everything people said on your patch.

https://lore.kernel.org/git/[email protected]/

Scroll down to see the "Thread overview".

* When you receive a review response to help you polish your patch submission, you are expected to respond to it. If the reviewer suggested an improvement, either you respond explaining why your original is better without the change suggested, or you respond thanking the reviewer for the suggestion and promise to submit an updated version that incorporates the suggested improvements, and then take your time to improve the patch and send a "reroll". For this patch, it would be numbered "v2".

As we can see, neither option has occurred, and this discussion thread is keeping everybody waiting.

Thanks.