From 2c411aeb07c91762047abd1fb9db638eecf3b234 Mon Sep 17 00:00:00 2001
From: Ian Davis <nospam@iandavis.com>
Date: Tue, 26 May 2020 09:53:50 +0100
Subject: [PATCH] Check error returns in tests

---
 core_test.go  | 24 ++++++++++++++++++------
 pipe_test.go  | 12 +++++++++---
 setup_test.go |  4 +++-
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/core_test.go b/core_test.go
index 2228eb9..40b43dd 100644
--- a/core_test.go
+++ b/core_test.go
@@ -39,7 +39,9 @@ func TestNewCoreFormat(t *testing.T) {
 		ws := zapcore.AddSync(buf)
 
 		core := newCore(tc.format, ws, LevelDebug)
-		core.Write(entry, nil)
+		if err := core.Write(entry, nil); err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
 
 		got := buf.String()
 		if got != tc.want {
@@ -66,7 +68,9 @@ func TestLockedMultiCoreAddCore(t *testing.T) {
 		Message:    "scooby",
 		Time:       time.Date(2010, 5, 23, 15, 14, 0, 0, time.UTC),
 	}
-	mc.Write(entry, nil)
+	if err := mc.Write(entry, nil); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	want1 := "2010-05-23T15:14:00.000Z\tINFO\tmain\tscooby\n"
 	got1 := buf1.String()
@@ -97,7 +101,9 @@ func TestLockedMultiCoreDeleteCore(t *testing.T) {
 		Message:    "scooby",
 		Time:       time.Date(2010, 5, 23, 15, 14, 0, 0, time.UTC),
 	}
-	mc.Write(entry, nil)
+	if err := mc.Write(entry, nil); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	buf2 := &bytes.Buffer{}
 	core2 := newCore(ColorizedOutput, zapcore.AddSync(buf2), LevelDebug)
@@ -114,7 +120,9 @@ func TestLockedMultiCoreDeleteCore(t *testing.T) {
 		Time:       time.Date(2010, 5, 23, 15, 15, 0, 0, time.UTC),
 	}
 
-	mc.Write(entry2, nil)
+	if err := mc.Write(entry2, nil); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	want1 := "2010-05-23T15:14:00.000Z\tINFO\tmain\tscooby\n"
 	got1 := buf1.String()
@@ -144,7 +152,9 @@ func TestLockedMultiCoreReplaceCore(t *testing.T) {
 		Message:    "scooby",
 		Time:       time.Date(2010, 5, 23, 15, 14, 0, 0, time.UTC),
 	}
-	mc.Write(entry, nil)
+	if err := mc.Write(entry, nil); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	buf2 := &bytes.Buffer{}
 	core2 := newCore(ColorizedOutput, zapcore.AddSync(buf2), LevelDebug)
@@ -160,7 +170,9 @@ func TestLockedMultiCoreReplaceCore(t *testing.T) {
 		Time:       time.Date(2010, 5, 23, 15, 15, 0, 0, time.UTC),
 	}
 
-	mc.Write(entry2, nil)
+	if err := mc.Write(entry2, nil); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	want1 := "2010-05-23T15:14:00.000Z\tINFO\tmain\tscooby\n"
 	got1 := buf1.String()
diff --git a/pipe_test.go b/pipe_test.go
index 60d96f4..8af4286 100644
--- a/pipe_test.go
+++ b/pipe_test.go
@@ -21,7 +21,9 @@ func TestNewPipeReader(t *testing.T) {
 	buf := &bytes.Buffer{}
 	go func() {
 		defer wg.Done()
-		io.Copy(buf, r)
+		if _, err := io.Copy(buf, r); err != nil && err != io.ErrClosedPipe {
+			t.Errorf("unexpected error: %v", err)
+		}
 	}()
 
 	log.Error("scooby")
@@ -45,7 +47,9 @@ func TestNewPipeReaderFormat(t *testing.T) {
 	buf := &bytes.Buffer{}
 	go func() {
 		defer wg.Done()
-		io.Copy(buf, r)
+		if _, err := io.Copy(buf, r); err != nil && err != io.ErrClosedPipe {
+			t.Errorf("unexpected error: %v", err)
+		}
 	}()
 
 	log.Error("scooby")
@@ -74,7 +78,9 @@ func TestNewPipeReaderLevel(t *testing.T) {
 	buf := &bytes.Buffer{}
 	go func() {
 		defer wg.Done()
-		io.Copy(buf, r)
+		if _, err := io.Copy(buf, r); err != nil && err != io.ErrClosedPipe {
+			t.Errorf("unexpected error: %v", err)
+		}
 	}()
 
 	log.Debug("scooby")
diff --git a/setup_test.go b/setup_test.go
index 7bd7fcd..3b0fe19 100644
--- a/setup_test.go
+++ b/setup_test.go
@@ -28,7 +28,9 @@ func TestGetLoggerDefault(t *testing.T) {
 	w.Close()
 
 	buf := &bytes.Buffer{}
-	io.Copy(buf, r)
+	if _, err := io.Copy(buf, r); err != nil && err != io.ErrClosedPipe {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	if !strings.Contains(buf.String(), "scooby") {
 		t.Errorf("got %q, wanted it to contain log output", buf.String())