Fix error checking in file read tests

This commit is contained in:
Łukasz Mierzwa
2018-01-27 09:57:19 -08:00
parent b8cf0a83f4
commit 782b633f8c
+16 -6
View File
@@ -80,17 +80,19 @@ var fileTransportTests = []fileTransportTest{
},
}
func readAll(source io.ReadCloser) int64 {
func readAll(source io.ReadCloser) (int64, error) {
var readSize int64
b := make([]byte, 512)
for {
got, err := source.Read(b)
readSize += int64(got)
if err == io.EOF {
break
if err != nil {
if err == io.EOF {
return readSize, nil
}
return readSize, err
}
}
return readSize
}
func TestHTTPReader(t *testing.T) {
@@ -134,9 +136,13 @@ func TestHTTPReader(t *testing.T) {
}
continue
}
got := readAll(source)
got, err := readAll(source)
source.Close()
if err != nil {
t.Errorf("[%v] Read() failed: %s", testCase, err)
}
if got != int64(len(responseBody)+1) {
t.Errorf("[%v] Wrong respone size, got %d, expected %d", testCase, got, len(responseBody))
}
@@ -158,9 +164,13 @@ func TestFileReader(t *testing.T) {
}
continue
}
got := readAll(source)
got, err := readAll(source)
source.Close()
if err != nil {
t.Errorf("[%v] Read() failed: %s", testCase, err)
}
if got != testCase.size {
t.Errorf("[%v] Wrong respone size, got %d, expected %d", testCase, got, testCase.size)
}