Skip to content

Commit c8b35b9

Browse files
szedergitster
authored andcommitted
t4051-diff-function-context: read the right file
The test ' context does not include preceding empty lines' in the block of tests 'change with long common tail and no context' in 't4051-diff-function-context.sh' tries to read the file 'long_common_tail.diff.diff', but that file doesn't exist as its name contains one more '.diff' suffixes than necessary. Despite this error the test still succeeded without checking what it's supposed to, because this erroneous read is done on the line: test "$(first_context_line <long_common_tail.diff.diff)" != " " which means that: - the command substitution hides the error, so it won't fail the test, and - the result of the command substitution is the empty string, which is, of course, not equal to a single space character, so the condition is fulfilled, and the test succeeds. As a minimal fix, fix the name of the file to be read. In the future we might want to reorganize this test script (1) to use 'test_cmp' instead of 'test's and command substitutions to catch failing commands and to provide helpful error messages, and (2) to specify what the expected result actually _is_ instead of what it isn't. Signed-off-by: SZEDER Gábor <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d3621de commit c8b35b9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t4051-diff-function-context.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ test_expect_success ' context does not include other functions' '
154154
'
155155

156156
test_expect_success ' context does not include preceding empty lines' '
157-
test "$(first_context_line <long_common_tail.diff.diff)" != " "
157+
test "$(first_context_line <long_common_tail.diff)" != " "
158158
'
159159

160160
test_done

0 commit comments

Comments
 (0)