t2030: modernize test path checks
PATCH 1/1 t2030: modernize test path checks
From: Srujith Poojary <[email protected]>
Replace old-style file checks with test_path_is_file and the helper test_path_is_missing for clearer failure diagnostics in test output.
Search with: git grep "test -[efd]" t/
---
t2030: modernize test path checks
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2256%2Fpoojarysrujith%2Fmicroproject-modernize-path-check-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2256/poojarysrujith/microproject-modernize-path-check-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2256
t/t2030-unresolve-info.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
t/t2030-unresolve-info.sh +2 -2
@@ -170,7 +170,7 @@ test_expect_success 'rerere and rerere forget' ' git rerere && rerere_id=$(cd .git/rr-cache && echo */postimage) && rerere_id=${rerere_id%/postimage} && - test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_file .git/rr-cache/$rerere_id/postimage && git checkout -m fi/le && echo resurrect the conflict && test_grep "^=======" fi/le &&
@@ -182,7 +182,7 @@ test_expect_success 'rerere and rerere forget' ' check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le && test -z "$(git ls-files -u)" && git rerere forget fi/le && - ! test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_missing .git/rr-cache/$rerere_id/postimage && tr "\0" "\n" <.git/MERGE_RR >actual && echo "$rerere_id fi/le" >expect && test_cmp expect actual
base-commit: 6de20f6092dcf9bdb1c8efe03db4b70c82b423dd
Signature · 1 line
gitgitgadget
PATCH v2 1/1 t2030: modernize test path checks
From: Srujith Poojary <[email protected]>
Replace old-style file checks with test_path_is_file and the helper
test_path_is_missing for clearer failure diagnostics in test output.
Search with: git grep "test -[efd]" t/
---
t2030: modernize test path checks
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2256%2Fpoojarysrujith%2Fmicroproject-modernize-path-check-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2256/poojarysrujith/microproject-modernize-path-check-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/2256
Range-diff vs v1:
1: 641b9330c9 ! 1: 93cf6c12f4 t2030: modernize test path checks
@@ Metadata
Author: Srujith Poojary <[email protected]>
## Commit message ##
- t2030: modernize test path checks
+ [Outreachy PATCH] t2030: modernize test path checks
Replace old-style file checks with test_path_is_file and the helper
+
test_path_is_missing for clearer failure diagnostics in test output.
Search with: git grep "test -[efd]" t/
t/t2030-unresolve-info.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
t/t2030-unresolve-info.sh +2 -2
@@ -170,7 +170,7 @@ test_expect_success 'rerere and rerere forget' ' git rerere && rerere_id=$(cd .git/rr-cache && echo */postimage) && rerere_id=${rerere_id%/postimage} && - test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_file .git/rr-cache/$rerere_id/postimage && git checkout -m fi/le && echo resurrect the conflict && test_grep "^=======" fi/le &&
@@ -182,7 +182,7 @@ test_expect_success 'rerere and rerere forget' ' check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le && test -z "$(git ls-files -u)" && git rerere forget fi/le && - ! test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_missing .git/rr-cache/$rerere_id/postimage && tr "\0" "\n" <.git/MERGE_RR >actual && echo "$rerere_id fi/le" >expect && test_cmp expect actual
base-commit: 6de20f6092dcf9bdb1c8efe03db4b70c82b423dd
Signature · 1 line
gitgitgadget
t/t2030-unresolve-info.sh test_expect_success 'rerere and rerere forget' ' · line 185
Quoted 10 lines
t/t2030-unresolve-info.sh +2
-1+ test_path_is_file .git/rr-cache/$rerere_id/postimage && git checkout -m fi/le && echo resurrect the conflict && test_grep "^=======" fi/le &&@@ -182,7 +182,7 @@ test_expect_success 'rerere and rerere forget' ' check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le && test -z "$(git ls-files -u)" && git rerere forget fi/le && - ! test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_missing .git/rr-cache/$rerere_id/postimage &&
Seems like a good change, but there are lots of these calls in the codebase. Maybe change the others ones too, while you're at it?
Harald
Hi Harald,
Thanks for taking a look at my patch!
Since this is for an Outreachy microproject, I kept the scope small to follow the guidelines. But I completely understand—if it helps, I can take a look at modernizing some of the other ones too in a separate patch.
Thanks,
Srujith A Poojary
Quoted 17 lines · Harald Nordgren
t/t2030-unresolve-info.sh test_expect_success 'rerere and rerere forget' ' · line 185
Quoted 11 lines
t/t2030-unresolve-info.sh +2
-1+ test_path_is_file .git/rr-cache/$rerere_id/postimage && git checkout -m fi/le && echo resurrect the conflict && test_grep "^=======" fi/le &&@@ -182,7 +182,7 @@ test_expect_success 'rerere and rerere forget' ' check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le && test -z "$(git ls-files -u)" && git rerere forget fi/le && - ! test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_missing .git/rr-cache/$rerere_id/postimage &&Seems like a good change, but there are lots of these calls in the codebase. Maybe change the others ones too, while you're at it?
Harald
Quoted 5 lines
Thanks for taking a look at my patch!
Since this is for an Outreachy microproject, I kept the scope small to follow the guidelines. But I completely understand—if it helps, I can take a look at modernizing some of the other ones too in a separate patch.
Firstly, do not toppost when replying to a message at Git. Use inline comments. While the guidelines talked about keeping the changes small, which is valid. But, that file has about four instances of the same "test -f", that is not a big change.
You can change all of those instances.
The main idea of Microproject is to get you familiar with the Git workflow.
Quoted 3 lines
Quoted 3 lines
Seems like a good change, but there are lots of these calls in the codebase. Maybe change the others ones too, while you're at it?
Valid.
Quoted 3 lines
Quoted 3 lines
Harald
Thanks at Harald for the review.
Thanks.
Usman.
Hi Usman,
Thanks for the feedback!
Got it—I will remove the search command and update all four instances of test -f in that file, and I'll make sure to use inline replies and CC mentors going forward.
I'll send out the v3 patch shortly.
Thanks,
Srujith A Poojary
Quoted 25 lines · Usman Akinyemi
Quoted 6 lines
Thanks for taking a look at my patch!
Since this is for an Outreachy microproject, I kept the scope small to follow the guidelines. But I completely understand—if it helps, I can take a look at modernizing some of the other ones too in a separate patch.Firstly, do not toppost when replying to a message at Git. Use inline comments. While the guidelines talked about keeping the changes small, which is valid. But, that file has about four instances of the same "test -f", that is not a big change.
You can change all of those instances.The main idea of Microproject is to get you familiar with the Git workflow.
Quoted 3 lines
Quoted 3 lines
Seems like a good change, but there are lots of these calls in the codebase. Maybe change the others ones too, while you're at it?
Valid.
Quoted 3 lines
Quoted 3 lines
Harald
Thanks at Harald for the review.
Thanks.
Usman.
Quoted 4 lines
test_path_is_missingfor clearer failure diagnostics in test output.Search with: git grep "test -[efd]" t/
Please, remove this, it is not needed and kindly go through other comments on other Outreachy applicant patches.
Quoted 8 lines
Signed-off-by Srujith Poojary <[email protected]>---
t2030: modernize test path checksRange-diff vs v1:
1:
641b9330c9! 1:93cf6c12f4t2030: modernize test path checks
I will also advise that whenever you are sending your patches or sending any query, kindly cc'ed
the mentors for visibility purposes.
Thanks for your interest in the Git project.
Usman
PATCH v3 1/1 t2030: modernize test path checks
In reply to Srujith A Poojary via GitGitGadgetFrom: Srujith Poojary <[email protected]>
Replace old-style file checks with test_path_is_file and the helper
test_path_is_missing for clearer failure diagnostics in test output.
---
t2030: modernize test path checks
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2256%2Fpoojarysrujith%2Fmicroproject-modernize-path-check-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2256/poojarysrujith/microproject-modernize-path-check-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/2256
Range-diff vs v2:
1: 93cf6c12f4 ! 1: 75086e1db0 [Outreachy PATCH] t2030: modernize test path checks
@@ Commit message
test_path_is_missing for clearer failure diagnostics in test output.
- Search with: git grep "test -[efd]" t/
-
## t/t2030-unresolve-info.sh ##
@@ t/t2030-unresolve-info.sh: test_expect_success 'rerere and rerere forget' '
tr "\0" "\n" <.git/MERGE_RR >actual &&
echo "$rerere_id fi/le" >expect &&
test_cmp expect actual
+@@ t/t2030-unresolve-info.sh: test_expect_success 'rerere and rerere forget (subdirectory)' '
+ (cd fi && git rerere) &&
+ rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+ rerere_id=${rerere_id%/postimage} &&
+- test -f .git/rr-cache/$rerere_id/postimage &&
++ test_path_is_file .git/rr-cache/$rerere_id/postimage &&
+ (cd fi && git checkout -m le) &&
+ echo resurrect the conflict &&
+ test_grep "^=======" fi/le &&
+@@ t/t2030-unresolve-info.sh: test_expect_success 'rerere and rerere forget (subdirectory)' '
+ check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+ test -z "$(git ls-files -u)" &&
+ (cd fi && git rerere forget le) &&
+- ! test -f .git/rr-cache/$rerere_id/postimage &&
++ test_path_is_missing .git/rr-cache/$rerere_id/postimage &&
+ tr "\0" "\n" <.git/MERGE_RR >actual &&
+ echo "$rerere_id fi/le" >expect &&
+ test_cmp expect actual
t/t2030-unresolve-info.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
t/t2030-unresolve-info.sh +4 -4
@@ -170,7 +170,7 @@ test_expect_success 'rerere and rerere forget' ' git rerere && rerere_id=$(cd .git/rr-cache && echo */postimage) && rerere_id=${rerere_id%/postimage} && - test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_file .git/rr-cache/$rerere_id/postimage && git checkout -m fi/le && echo resurrect the conflict && test_grep "^=======" fi/le &&
@@ -182,7 +182,7 @@ test_expect_success 'rerere and rerere forget' ' check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le && test -z "$(git ls-files -u)" && git rerere forget fi/le && - ! test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_missing .git/rr-cache/$rerere_id/postimage && tr "\0" "\n" <.git/MERGE_RR >actual && echo "$rerere_id fi/le" >expect && test_cmp expect actual
@@ -196,7 +196,7 @@ test_expect_success 'rerere and rerere forget (subdirectory)' ' (cd fi && git rerere) && rerere_id=$(cd .git/rr-cache && echo */postimage) && rerere_id=${rerere_id%/postimage} && - test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_file .git/rr-cache/$rerere_id/postimage && (cd fi && git checkout -m le) && echo resurrect the conflict && test_grep "^=======" fi/le &&
@@ -208,7 +208,7 @@ test_expect_success 'rerere and rerere forget (subdirectory)' ' check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le && test -z "$(git ls-files -u)" && (cd fi && git rerere forget le) && - ! test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_missing .git/rr-cache/$rerere_id/postimage && tr "\0" "\n" <.git/MERGE_RR >actual && echo "$rerere_id fi/le" >expect && test_cmp expect actual
base-commit: 6de20f6092dcf9bdb1c8efe03db4b70c82b423dd
Signature · 1 line
gitgitgadget
"Srujith A Poojary via GitGitGadget" <[email protected]>
t/t2030-unresolve-info.sh test_expect_success 'rerere and rerere forget' ' · line 173
Quoted 10 lines · writes:
t/t2030-unresolve-info.sh +1
-1@@ -170,7 +170,7 @@ test_expect_success 'rerere and rerere forget' ' git rerere && rerere_id=$(cd .git/rr-cache && echo */postimage) && rerere_id=${rerere_id%/postimage} && - test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_file .git/rr-cache/$rerere_id/postimage &&
OK.
t/t2030-unresolve-info.sh test_expect_success 'rerere and rerere forget' ' · line 174
Quoted 2 lines
t/t2030-unresolve-info.sh +1
-1- ! test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_missing .git/rr-cache/$rerere_id/postimage &&
OK.
t/t2030-unresolve-info.sh test_expect_success 'rerere and rerere forget' ' · line 175
Quoted 2 lines
t/t2030-unresolve-info.sh +1
-1- test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_file .git/rr-cache/$rerere_id/postimage &&
OK.
t/t2030-unresolve-info.sh test_expect_success 'rerere and rerere forget' ' · line 176
Quoted 2 lines
t/t2030-unresolve-info.sh +1
-1- ! test -f .git/rr-cache/$rerere_id/postimage && + test_path_is_missing .git/rr-cache/$rerere_id/postimage &&
OK.