Skip to content

Commit 7478889

Browse files
committed
Do not accept io.EOF when expecting an error
This should almost always be handled specially, so don't let tests that expect errors hide the fact that they returned an io.EOF. This could be revisited if the tests are ever updated to check for specific errors.
1 parent 7b9443b commit 7478889

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

gitdiff/file_header_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package gitdiff
22

33
import (
4+
"io"
45
"os"
56
"reflect"
67
"testing"
@@ -152,8 +153,8 @@ index deadbeef
152153

153154
f, err := p.ParseGitFileHeader()
154155
if test.Err {
155-
if err == nil {
156-
t.Fatalf("expected error parsing git file header, got nil")
156+
if err == nil || err == io.EOF {
157+
t.Fatalf("expected error parsing git file header, got %v", err)
157158
}
158159
return
159160
}
@@ -257,8 +258,8 @@ context line
257258

258259
f, err := p.ParseTraditionalFileHeader()
259260
if test.Err {
260-
if err == nil {
261-
t.Fatalf("expected error parsing traditional file header, got nil")
261+
if err == nil || err == io.EOF {
262+
t.Fatalf("expected error parsing traditional file header, got %v", err)
262263
}
263264
return
264265
}
@@ -357,8 +358,8 @@ func TestParseName(t *testing.T) {
357358
t.Run(name, func(t *testing.T) {
358359
output, n, err := parseName(test.Input, test.Term, test.Drop)
359360
if test.Err {
360-
if err == nil {
361-
t.Fatalf("expected error parsing name, but got nil")
361+
if err == nil || err == io.EOF {
362+
t.Fatalf("expected error parsing name, but got %v", err)
362363
}
363364
return
364365
}
@@ -596,8 +597,8 @@ func TestParseGitHeaderData(t *testing.T) {
596597

597598
end, err := parseGitHeaderData(&f, test.Line, test.DefaultName)
598599
if test.Err {
599-
if err == nil {
600-
t.Fatalf("expected error parsing header data, but got nil")
600+
if err == nil || err == io.EOF {
601+
t.Fatalf("expected error parsing header data, but got %v", err)
601602
}
602603
return
603604
}

0 commit comments

Comments
 (0)