From 782b633f8c6ba5e49e57daa9e7b0189a4afc8a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Sat, 27 Jan 2018 09:36:59 -0800
Subject: [PATCH] Fix error checking in file read tests

---
 internal/uri/uri_test.go | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/internal/uri/uri_test.go b/internal/uri/uri_test.go
index 5f312551d..667c1547f 100644
--- a/internal/uri/uri_test.go
+++ b/internal/uri/uri_test.go
@@ -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)
 		}