From 2be60f5d30131ce93dd9be3ec0ae9cb0a940bb2e Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Wed, 19 May 2021 10:46:09 -0700 Subject: [PATCH] fix staticcheck --- gostream_test.go | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/gostream_test.go b/gostream_test.go index e25d4e1..a47f36b 100644 --- a/gostream_test.go +++ b/gostream_test.go @@ -3,6 +3,7 @@ package gostream import ( "bufio" "context" + "io" "testing" "time" @@ -45,38 +46,44 @@ func TestServerClient(t *testing.T) { go func(ctx context.Context) { listener, err := Listen(srvHost, tag) if err != nil { - t.Fatal(err) + t.Error(err) + return } defer listener.Close() if listener.Addr().String() != srvHost.ID().Pretty() { - t.Fatal("bad listener address") + t.Error("bad listener address") + return } servConn, err := listener.Accept() if err != nil { - t.Fatal(err) + t.Error(err) + return } defer servConn.Close() reader := bufio.NewReader(servConn) for { msg, err := reader.ReadString('\n') + if err == io.EOF { + break + } if err != nil { - t.Fatal(err) + t.Error(err) + return } - if string(msg) != "is libp2p awesome?\n" { - t.Fatalf("Bad incoming message: %s", msg) + if msg != "is libp2p awesome?\n" { + t.Errorf("Bad incoming message: %s", msg) + return } _, err = servConn.Write([]byte("yes it is\n")) if err != nil { - t.Fatal(err) - } - select { - case <-ctx.Done(): + t.Error(err) return } + <-ctx.Done() } }(ctx)