Skip to contentSkip to conversation

t9811: replace 'test -f' and '! test -f' with 'test_path_*'

PATCH In review Marcelo Machado Lage 3 participants 9 messages Jul 2 – Jul 13

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 t9811: replace 'test -f' and '! test -f' with 'test_path_*'

Replace the basic shell commands 'test -f', with more modern test helpers 'test_path_is_file' and 'test_path_is_missing'.

---
 t/t9811-git-p4-label-import.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
t/t9811-git-p4-label-import.sh +8 -8
index 7614dfbd95..93d6b4c479 100755
@@ -62,9 +62,9 @@ test_expect_success 'basic p4 labels' '
 
 		cd main &&
 		git checkout TAG_F1_ONLY &&
-		! test -f f2 &&
+		test_path_is_missing f2 &&
 		git checkout TAG_WITH\$_SHELL_CHAR &&
-		test -f f1 && test -f f2 && test -f file_with_\$metachar &&
+		test_path_is_file f1 && test_path_is_file f2 && test_path_is_file file_with_\$metachar &&
 
 		git show TAG_LONG_LABEL | grep -q "A Label second line"
 	)
@@ -102,11 +102,11 @@ test_expect_success 'two labels on the same changelist' '
 
 		git checkout TAG_F1_1 &&
 		ls &&
-		test -f f1 &&
+		test_path_is_file f1 &&
 
 		git checkout TAG_F1_2 &&
 		ls &&
-		test -f f1
+		test_path_is_file f1
 	)
 '
 
@@ -135,9 +135,9 @@ test_expect_success 'export git tags to p4' '
 		p4 labels ... | grep LIGHTWEIGHT_TAG &&
 		p4 label -o GIT_TAG_1 | grep "tag created in git:xyzzy" &&
 		p4 sync ...@GIT_TAG_1 &&
-		! test -f main/f10 &&
+		test_path_is_missing main/f10 &&
 		p4 sync ...@GIT_TAG_2 &&
-		test -f main/f10
+		test_path_is_file main/f10
 	)
 '
 
@@ -168,9 +168,9 @@ test_expect_success 'export git tags to p4 with deletion' '
 		cd "$cli" &&
 		p4 sync ... &&
 		p4 sync ...@GIT_TAG_ON_DELETED &&
-		test -f main/deleted_file &&
+		test_path_is_file main/deleted_file &&
 		p4 sync ...@GIT_TAG_AFTER_DELETION &&
-		! test -f main/deleted_file &&
+		test_path_is_missing main/deleted_file &&
 		echo "checking label contents" &&
 		p4 label -o GIT_TAG_ON_DELETED | grep "tag on deleted file"
 	)

base-commit: e9019fcafe0040228b8631c30f97ae1adb61bcdc

Signature · 1 line
2.34.1
#1 lore raw
Quoted 2 lines · Marcelo Machado Lage

Replace the basic shell commands 'test -f', with more modern test helpers 'test_path_is_file' and 'test_path_is_missing'.

Nit: it might make sense to briefly mention why we do this exercise. Like, what does test_path_is_file et al give us over test -f?

t/t9811-git-p4-label-import.sh test_expect_success 'basic p4 labels' ' · line 67

Quoted 13 lines
t/t9811-git-p4-label-import.sh +2 -2
index 7614dfbd95..93d6b4c479 100755
@@ -62,9 +62,9 @@ test_expect_success 'basic p4 labels' '
 
 		cd main &&
 		git checkout TAG_F1_ONLY &&
-		! test -f f2 &&
+		test_path_is_missing f2 &&
 		git checkout TAG_WITH\$_SHELL_CHAR &&
-		test -f f1 && test -f f2 && test -f file_with_\$metachar &&
+		test_path_is_file f1 && test_path_is_file f2 && test_path_is_file file_with_\$metachar &&

While at it we could split this line into three lines -- it's getting overly long, and we typically don't chain multiple commands on one line nowadays.

t/t9811-git-p4-label-import.sh test_expect_success 'export git tags to p4' ' · line 138

Quoted 6 lines
t/t9811-git-p4-label-import.sh +1 -1
@@ -135,9 +135,9 @@ test_expect_success 'export git tags to p4' '
 		p4 labels ... | grep LIGHTWEIGHT_TAG &&
 		p4 label -o GIT_TAG_1 | grep "tag created in git:xyzzy" &&
 		p4 sync ...@GIT_TAG_1 &&
-		! test -f main/f10 &&
+		test_path_is_missing main/f10 &&

This is a stronger guarantee compared to before, as we only checked whether the path is not a file. Now we verify that it doesn't exist at all, which would be equivalent to test -e. That's a strict improvement though, but may be worth pointing out in the commit message so that the reviewer is not surprised.

t/t9811-git-p4-label-import.sh test_expect_success 'export git tags to p4 with deletion' ' · line 173

Quoted 9 lines
t/t9811-git-p4-label-import.sh +2 -2
@@ -168,9 +168,9 @@ test_expect_success 'export git tags to p4 with deletion' '
 		cd "$cli" &&
 		p4 sync ... &&
 		p4 sync ...@GIT_TAG_ON_DELETED &&
-		test -f main/deleted_file &&
+		test_path_is_file main/deleted_file &&
 		p4 sync ...@GIT_TAG_AFTER_DELETION &&
-		! test -f main/deleted_file &&
+		test_path_is_missing main/deleted_file &&

Same here.

Other than that the patch looks good to me, thanks!

Patrick

#2 lore raw
Quoted 6 lines · Patrick Steinhardt

t/t9811-git-p4-label-import.sh test_expect_success 'basic p4 labels' ' · line 67

Quoted 2 lines
t/t9811-git-p4-label-import.sh +1 -1
-		test -f f1 && test -f f2 && test -f file_with_\$metachar &&
+		test_path_is_file f1 && test_path_is_file f2 && test_path_is_file file_with_\$metachar &&

While at it we could split this line into three lines -- it's getting overly long, and we typically don't chain multiple commands on one line nowadays.

Excellent.

Quoted 8 lines

t/t9811-git-p4-label-import.sh test_expect_success 'export git tags to p4' ' · line 138

Quoted 2 lines
t/t9811-git-p4-label-import.sh +1 -1
-		! test -f main/f10 &&
+		test_path_is_missing main/f10 &&

This is a stronger guarantee compared to before, as we only checked whether the path is not a file. Now we verify that it doesn't exist at all, which would be equivalent to test -e. That's a strict improvement though, but may be worth pointing out in the commit message so that the reviewer is not surprised.

Good.

#3 lore raw
In reply to Patrick Steinhardt

Em sex., 3 de jul. de 2026 às 05:20, Patrick Steinhardt <[email protected]> escreveu:

Quoted 7 lines · Marcelo Machado Lage
Quoted 2 lines

Replace the basic shell commands 'test -f', with more modern test helpers 'test_path_is_file' and 'test_path_is_missing'.

Nit: it might make sense to briefly mention why we do this exercise. Like, what does test_path_is_file et al give us over test -f?

We'll add this in v2.

Quoted 7 lines
Quoted 7 lines
t/t9811-git-p4-label-import.sh +0 -0
index 7614dfbd95..93d6b4c479 100755
@@ -62,9 +62,9 @@ test_expect_success 'basic p4 labels' '
 
Quoted 11 lines

t/t9811-git-p4-label-import.sh test_expect_success 'basic p4 labels' ' · line 67

Quoted 7 lines
t/t9811-git-p4-label-import.sh +2 -2
              cd main &&
              git checkout TAG_F1_ONLY &&
-             ! test -f f2 &&
+             test_path_is_missing f2 &&
              git checkout TAG_WITH\$_SHELL_CHAR &&
-             test -f f1 && test -f f2 && test -f file_with_\$metachar &&
+             test_path_is_file f1 && test_path_is_file f2 && test_path_is_file file_with_\$metachar &&

While at it we could split this line into three lines -- it's getting overly long, and we typically don't chain multiple commands on one line nowadays.

We'll do this for v2 as well and make it into a patch series to separate test interface modernization from formatting changes.

While on this, there are some other places in the file where multiple commands in a && chain appear in a single line, e.g. in line 244:

Quoted 1 line

p4 edit f2 && date >f2 && p4 submit -d "change" f2 &&

Should we split these into multiple lines as well, even though they are under the 80 characters limit?

Quoted 13 lines

t/t9811-git-p4-label-import.sh test_expect_success 'export git tags to p4' ' · line 138

Quoted 7 lines
t/t9811-git-p4-label-import.sh +1 -1
@@ -135,9 +135,9 @@ test_expect_success 'export git tags to p4' '
              p4 labels ... | grep LIGHTWEIGHT_TAG &&
              p4 label -o GIT_TAG_1 | grep "tag created in git:xyzzy" &&
              p4 sync ...@GIT_TAG_1 &&
-             ! test -f main/f10 &&
+             test_path_is_missing main/f10 &&

This is a stronger guarantee compared to before, as we only checked whether the path is not a file. Now we verify that it doesn't exist at all, which would be equivalent to test -e. That's a strict improvement though, but may be worth pointing out in the commit message so that the reviewer is not surprised.

We overlooked this improvement at first, but we'll add a proper note about it in v2.

Quoted 13 lines

t/t9811-git-p4-label-import.sh test_expect_success 'export git tags to p4 with deletion' ' · line 173

Quoted 10 lines
t/t9811-git-p4-label-import.sh +2 -2
@@ -168,9 +168,9 @@ test_expect_success 'export git tags to p4 with deletion' '
              cd "$cli" &&
              p4 sync ... &&
              p4 sync ...@GIT_TAG_ON_DELETED &&
-             test -f main/deleted_file &&
+             test_path_is_file main/deleted_file &&
              p4 sync ...@GIT_TAG_AFTER_DELETION &&
-             ! test -f main/deleted_file &&
+             test_path_is_missing main/deleted_file &&

Same here.

Quoted 1 line

Other than that the patch looks good to me, thanks!

Thanks for the detailed feedback, Patrick!

Best,
Marcelo

Quoted 2 lines

Patrick

#4 lore raw
Quoted 20 lines · Marcelo Machado Lage

Em sex., 3 de jul. de 2026 às 05:20, Patrick Steinhardt <[email protected]> escreveu:

Quoted 7 lines · Marcelo Machado Lage
Quoted 6 lines
t/t9811-git-p4-label-import.sh +0 -0
index 7614dfbd95..93d6b4c479 100755
@@ -62,9 +62,9 @@ test_expect_success 'basic p4 labels' '
 
Quoted 11 lines

t/t9811-git-p4-label-import.sh test_expect_success 'basic p4 labels' ' · line 67

Quoted 7 lines
t/t9811-git-p4-label-import.sh +2 -2
              cd main &&
              git checkout TAG_F1_ONLY &&
-             ! test -f f2 &&
+             test_path_is_missing f2 &&
              git checkout TAG_WITH\$_SHELL_CHAR &&
-             test -f f1 && test -f f2 && test -f file_with_\$metachar &&
+             test_path_is_file f1 && test_path_is_file f2 && test_path_is_file file_with_\$metachar &&

While at it we could split this line into three lines -- it's getting overly long, and we typically don't chain multiple commands on one line nowadays.

Quoted 8 lines

We'll do this for v2 as well and make it into a patch series to separate test interface modernization from formatting changes.

While on this, there are some other places in the file where multiple commands in a && chain appear in a single line, e.g. in line 244:

Quoted 1 line

p4 edit f2 && date >f2 && p4 submit -d "change" f2 &&

Should we split these into multiple lines as well, even though they are under the 80 characters limit?

Sure, if you want to convert this into a patch series anyway then I think it makes sense to adapt all such locations in this test suite.

Patrick

#5 lore raw

v2 cover t9811: reformat and modernize tests

In reply to Marcelo Machado Lage

This patch series reformats and modernizes the t9811 tests. Changes since v1:
- Break long && chains into multiple lines according to how git tests are written nowadays. This was suggested by Patrick Steinhardt.
- Replace 'test -f' calls by more useful 'test_path_*' helpers as the second commit in the series.

Marcelo Machado Lage (2):
t9811: break long && chains into multiple lines
t9811: replace 'test -f' and '! test -f' with 'test_path_*'

 t/t9811-git-p4-label-import.sh | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

Range-diff against v1:

-:  ---------- > 1:  0f03c913eb t9811: break long && chains into multiple lines
1:  f319f2e6e7 ! 2:  3e590881c3 t9811: replace 'test -f' and '! test -f' with 'test_path_*'
    @@ Commit message
     
         Replace the basic shell commands 'test -f', with more modern test
         helpers 'test_path_is_file' and 'test_path_is_missing'.
    +    These modern helpers emit useful information when the corresponding
    +    tests fail, unlike 'test -f' and '! test -f'.
    +
    +    The occurrences of '! test -f filename' were replaced by
    +    'file_path_is_missing filename', a stronger guarantee equivalent to
    +    '! test -e filename'.
    +
    +    Co-authored-by: Vinicius Lira de Freitas <[email protected]>
    +    Signed-off-by: Vinicius Lira de Freitas <[email protected]>
    +    Signed-off-by: Marcelo Machado Lage <[email protected]>
     
      ## t/t9811-git-p4-label-import.sh ##
     @@ t/t9811-git-p4-label-import.sh: test_expect_success 'basic p4 labels' '
    @@ t/t9811-git-p4-label-import.sh: test_expect_success 'basic p4 labels' '
     -		! test -f f2 &&
     +		test_path_is_missing f2 &&
      		git checkout TAG_WITH\$_SHELL_CHAR &&
    --		test -f f1 && test -f f2 && test -f file_with_\$metachar &&
    -+		test_path_is_file f1 && test_path_is_file f2 && test_path_is_file file_with_\$metachar &&
    +-		test -f f1 &&
    +-		test -f f2 &&
    +-		test -f file_with_\$metachar &&
    ++		test_path_is_file f1 &&
    ++		test_path_is_file f2 &&
    ++		test_path_is_file file_with_\$metachar &&
      
      		git show TAG_LONG_LABEL | grep -q "A Label second line"
      	)
Signature · 1 line
2.34.1
#6 lore raw

PATCH v2 1/2 t9811: break long && chains into multiple lines

Rewrite single-line && chains by breaking them into multiple lines.

---
 t/t9811-git-p4-label-import.sh | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
t/t9811-git-p4-label-import.sh +15 -5
index 7614dfbd95..072bc88210 100755
@@ -64,7 +64,9 @@ test_expect_success 'basic p4 labels' '
 		git checkout TAG_F1_ONLY &&
 		! test -f f2 &&
 		git checkout TAG_WITH\$_SHELL_CHAR &&
-		test -f f1 && test -f f2 && test -f file_with_\$metachar &&
+		test -f f1 &&
+		test -f f2 &&
+		test -f file_with_\$metachar &&
 
 		git show TAG_LONG_LABEL | grep -q "A Label second line"
 	)
@@ -231,17 +233,25 @@ test_expect_success 'importing labels with missing revisions' '
 		P4CLIENT=missing-revision &&
 		client_view "//depot/missing-revision/... //missing-revision/..." &&
 		cd "$cli" &&
-		>f1 && p4 add f1 && p4 submit -d "start" &&
+		>f1 && 
+		p4 add f1 &&
+		p4 submit -d "start" &&
 
 		p4 tag -l TAG_S0 ... &&
 
-		>f2 && p4 add f2 && p4 submit -d "second" &&
+		>f2 &&
+		p4 add f2 &&
+		p4 submit -d "second" &&
 
 		startrev=$(p4_head_revision //depot/missing-revision/...) &&
 
-		>f3 && p4 add f3 && p4 submit -d "third" &&
+		>f3 &&
+		p4 add f3 &&
+		p4 submit -d "third" &&
 
-		p4 edit f2 && date >f2 && p4 submit -d "change" f2 &&
+		p4 edit f2 &&
+		date >f2 &&
+		p4 submit -d "change" f2 &&
 
 		endrev=$(p4_head_revision //depot/missing-revision/...) &&
 
Signature · 1 line
2.34.1
#7 lore raw

PATCH v2 2/2 t9811: replace 'test -f' and '! test -f' with 'test_path_*'

In reply to Marcelo Machado Lage

Replace the basic shell commands 'test -f', with more modern test helpers 'test_path_is_file' and 'test_path_is_missing'. These modern helpers emit useful information when the corresponding tests fail, unlike 'test -f' and '! test -f'.

The occurrences of '! test -f filename' were replaced by 'file_path_is_missing filename', a stronger guarantee equivalent to '! test -e filename'.

---
 t/t9811-git-p4-label-import.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
t/t9811-git-p4-label-import.sh +10 -10
index 072bc88210..866d7b597b 100755
@@ -62,11 +62,11 @@ test_expect_success 'basic p4 labels' '
 
 		cd main &&
 		git checkout TAG_F1_ONLY &&
-		! test -f f2 &&
+		test_path_is_missing f2 &&
 		git checkout TAG_WITH\$_SHELL_CHAR &&
-		test -f f1 &&
-		test -f f2 &&
-		test -f file_with_\$metachar &&
+		test_path_is_file f1 &&
+		test_path_is_file f2 &&
+		test_path_is_file file_with_\$metachar &&
 
 		git show TAG_LONG_LABEL | grep -q "A Label second line"
 	)
@@ -104,11 +104,11 @@ test_expect_success 'two labels on the same changelist' '
 
 		git checkout TAG_F1_1 &&
 		ls &&
-		test -f f1 &&
+		test_path_is_file f1 &&
 
 		git checkout TAG_F1_2 &&
 		ls &&
-		test -f f1
+		test_path_is_file f1
 	)
 '
 
@@ -137,9 +137,9 @@ test_expect_success 'export git tags to p4' '
 		p4 labels ... | grep LIGHTWEIGHT_TAG &&
 		p4 label -o GIT_TAG_1 | grep "tag created in git:xyzzy" &&
 		p4 sync ...@GIT_TAG_1 &&
-		! test -f main/f10 &&
+		test_path_is_missing main/f10 &&
 		p4 sync ...@GIT_TAG_2 &&
-		test -f main/f10
+		test_path_is_file main/f10
 	)
 '
 
@@ -170,9 +170,9 @@ test_expect_success 'export git tags to p4 with deletion' '
 		cd "$cli" &&
 		p4 sync ... &&
 		p4 sync ...@GIT_TAG_ON_DELETED &&
-		test -f main/deleted_file &&
+		test_path_is_file main/deleted_file &&
 		p4 sync ...@GIT_TAG_AFTER_DELETION &&
-		! test -f main/deleted_file &&
+		test_path_is_missing main/deleted_file &&
 		echo "checking label contents" &&
 		p4 label -o GIT_TAG_ON_DELETED | grep "tag on deleted file"
 	)
Signature · 1 line
2.34.1
#8 lore raw

Re: [PATCH v2 0/2] t9811: reformat and modernize tests

In reply to Marcelo Machado Lage
Quoted 6 lines · Marcelo Machado Lage

This patch series reformats and modernizes the t9811 tests. Changes since v1:
- Break long && chains into multiple lines according to how git tests are written nowadays. This was suggested by Patrick Steinhardt.
- Replace 'test -f' calls by more useful 'test_path_*' helpers as the second commit in the series.

Thanks, I'm happy with this version!

Patrick