t4117: check for files using test_path_is_file

Martin Ågren · gitster · commit 91de82adc9f4 · 2020-02-24T11:15:40.000-08:00
We `cat` files, but don't inspect or grab the contents in any way. These
`cat` calls look like remnants from a debug session, so it's tempting to
get rid of them. But they do actually verify that the files exist, which
might not necessarily be the case for some failure modes of `git apply
--reject`. Let's not lose that.

Convert the `cat` calls to use `test_path_is_file` instead. This is of
course still a minor change since we no longer verify that the files can
be opened for reading, but that is not something we usually worry about.

Signed-off-by: Martin Ågren &lt;martin.agren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t4117-apply-reject.sh b/t/t4117-apply-reject.sh
@@ -74,7 +74,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
 	test_must_fail git apply --reject patch.1 &&
 	test_cmp expected file1 &&
 
-	cat file1.rej &&
+	test_path_is_file file1.rej &&
 	test_path_is_missing file2.rej
 '
 
@@ -87,7 +87,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
 	test_path_is_missing file1 &&
 	test_cmp expected file2 &&
 
-	cat file2.rej &&
+	test_path_is_file file2.rej &&
 	test_path_is_missing file1.rej
 
 '
@@ -101,7 +101,7 @@ test_expect_success 'the same test with --verbose' '
 	test_path_is_missing file1 &&
 	test_cmp expected file2 &&
 
-	cat file2.rej &&
+	test_path_is_file file2.rej &&
 	test_path_is_missing file1.rej
 
 '

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ test_expect_success 'apply with --reject should fail but update the file' '`
`74`	`74`	`test_must_fail git apply --reject patch.1 &&`
`75`	`75`	`test_cmp expected file1 &&`
`76`	`76`
`77`		`- cat file1.rej &&`
	`77`	`+ test_path_is_file file1.rej &&`
`78`	`78`	`test_path_is_missing file2.rej`
`79`	`79`	`'`
`80`	`80`
`@@ -87,7 +87,7 @@ test_expect_success 'apply with --reject should fail but update the file' '`
`87`	`87`	`test_path_is_missing file1 &&`
`88`	`88`	`test_cmp expected file2 &&`
`89`	`89`
`90`		`- cat file2.rej &&`
	`90`	`+ test_path_is_file file2.rej &&`
`91`	`91`	`test_path_is_missing file1.rej`
`92`	`92`
`93`	`93`	`'`
`@@ -101,7 +101,7 @@ test_expect_success 'the same test with --verbose' '`
`101`	`101`	`test_path_is_missing file1 &&`
`102`	`102`	`test_cmp expected file2 &&`
`103`	`103`
`104`		`- cat file2.rej &&`
	`104`	`+ test_path_is_file file2.rej &&`
`105`	`105`	`test_path_is_missing file1.rej`
`106`	`106`
`107`	`107`	`'`