t4117: check for files using `test_path_is_file`
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 <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin Ågren committed
Feb 23, 2020 at 09:48 UTC
91de82adc9f467c58b10fbcf79a62aa599796456
1 file changed
+3
-3
t/t4117-apply-reject.sh
+3
-3
@@ -74,7 +74,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
74
test_must_fail git apply --reject patch.1 &&
75
test_cmp expected file1 &&
76
77
- cat file1.rej &&
77
+ test_path_is_file file1.rej &&
78
test_path_is_missing file2.rej
79
'
80
@@ -87,7 +87,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
87
test_path_is_missing file1 &&
88
test_cmp expected file2 &&
89
90
- cat file2.rej &&
90
+ test_path_is_file file2.rej &&
91
test_path_is_missing file1.rej
92
93
'
@@ -101,7 +101,7 @@ test_expect_success 'the same test with --verbose' '
101
test_path_is_missing file1 &&
102
test_cmp expected file2 &&
103
104
- cat file2.rej &&
104
+ test_path_is_file file2.rej &&
105
test_path_is_missing file1.rej
106
107
'