Skip to content

Commit 8432735

Browse files
committed
TUN-4060: Fix Go Vet warnings (new with go 1.16) where t.Fatalf is called from a test goroutine
1 parent d67fbbf commit 8432735

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

carrier/carrier_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ func TestStartServer(t *testing.T) {
8181
go func() {
8282
err := Serve(wsConn, listener, shutdownC, options)
8383
if err != nil {
84-
t.Fatalf("Error running server: %v", err)
84+
t.Errorf("Error running server: %v", err)
85+
return
8586
}
8687
}()
8788

h2mux/h2mux_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,8 @@ func AssertIfPipeReadable(t *testing.T, pipe io.ReadCloser) {
663663
b := []byte{0}
664664
n, err := pipe.Read(b)
665665
if n > 0 {
666-
t.Fatalf("read pipe was not empty")
666+
t.Errorf("read pipe was not empty")
667+
return
667668
}
668669
errC <- err
669670
}()

h2mux/shared_buffer_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ func TestSharedBufferConcurrentReadWrite(t *testing.T) {
8181
expectedResult.Write(block[:blockSize])
8282
n, err := b.Write(block[:blockSize])
8383
if n != blockSize || err != nil {
84-
t.Fatalf("write error: %d %s", n, err)
84+
t.Errorf("write error: %d %s", n, err)
85+
return
8586
}
8687
}
8788
}
@@ -94,7 +95,8 @@ func TestSharedBufferConcurrentReadWrite(t *testing.T) {
9495
for i := 0; i < 256; i++ {
9596
n, err := io.ReadFull(b, block[:blockSize])
9697
if n != blockSize || err != nil {
97-
t.Fatalf("read error: %d %s", n, err)
98+
t.Errorf("read error: %d %s", n, err)
99+
return
98100
}
99101
actualResult.Write(block[:blockSize])
100102
}

0 commit comments

Comments
 (0)