From 8432735867120c4ba10b2f05dd133fa2c556975b Mon Sep 17 00:00:00 2001 From: Nuno Diegues Date: Tue, 16 Mar 2021 14:47:57 +0000 Subject: [PATCH] TUN-4060: Fix Go Vet warnings (new with go 1.16) where t.Fatalf is called from a test goroutine --- carrier/carrier_test.go | 3 ++- h2mux/h2mux_test.go | 3 ++- h2mux/shared_buffer_test.go | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/carrier/carrier_test.go b/carrier/carrier_test.go index 364b4296..7315873c 100644 --- a/carrier/carrier_test.go +++ b/carrier/carrier_test.go @@ -81,7 +81,8 @@ func TestStartServer(t *testing.T) { go func() { err := Serve(wsConn, listener, shutdownC, options) if err != nil { - t.Fatalf("Error running server: %v", err) + t.Errorf("Error running server: %v", err) + return } }() diff --git a/h2mux/h2mux_test.go b/h2mux/h2mux_test.go index 180cffe1..a28abb59 100644 --- a/h2mux/h2mux_test.go +++ b/h2mux/h2mux_test.go @@ -663,7 +663,8 @@ func AssertIfPipeReadable(t *testing.T, pipe io.ReadCloser) { b := []byte{0} n, err := pipe.Read(b) if n > 0 { - t.Fatalf("read pipe was not empty") + t.Errorf("read pipe was not empty") + return } errC <- err }() diff --git a/h2mux/shared_buffer_test.go b/h2mux/shared_buffer_test.go index 5de77fc9..fe438fae 100644 --- a/h2mux/shared_buffer_test.go +++ b/h2mux/shared_buffer_test.go @@ -81,7 +81,8 @@ func TestSharedBufferConcurrentReadWrite(t *testing.T) { expectedResult.Write(block[:blockSize]) n, err := b.Write(block[:blockSize]) if n != blockSize || err != nil { - t.Fatalf("write error: %d %s", n, err) + t.Errorf("write error: %d %s", n, err) + return } } } @@ -94,7 +95,8 @@ func TestSharedBufferConcurrentReadWrite(t *testing.T) { for i := 0; i < 256; i++ { n, err := io.ReadFull(b, block[:blockSize]) if n != blockSize || err != nil { - t.Fatalf("read error: %d %s", n, err) + t.Errorf("read error: %d %s", n, err) + return } actualResult.Write(block[:blockSize]) }