From e0a92cec10ff24dfbbce515cf396bc5bb444348e Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Fri, 23 Oct 2020 07:30:12 -0300 Subject: [PATCH] Update goleak check and improve goroutine test check --- logs/handler_test.go | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/logs/handler_test.go b/logs/handler_test.go index 6fb718b..e9de142 100644 --- a/logs/handler_test.go +++ b/logs/handler_test.go @@ -16,11 +16,11 @@ import ( var queryTimeout = 30 * time.Second func Test_logsHandlerDoesNotLeakGoroutinesWhenProviderClosesStream(t *testing.T) { - defer goleak.VerifyNoLeaks(t) + defer goleak.VerifyNone(t) msgs := []Message{ - Message{Name: "funcFoo", Text: "msg 0", Namespace: "default"}, - Message{Name: "funcFoo", Text: "msg 1"}, + {Name: "funcFoo", Text: "msg 0", Namespace: "default"}, + {Name: "funcFoo", Text: "msg 1"}, } var expected bytes.Buffer @@ -51,11 +51,11 @@ func Test_logsHandlerDoesNotLeakGoroutinesWhenProviderClosesStream(t *testing.T) } func Test_logsHandlerDoesNotLeakGoroutinesWhenClientClosesConnection(t *testing.T) { - defer goleak.VerifyNoLeaks(t) + defer goleak.VerifyNone(t) msgs := []Message{ - Message{Name: "funcFoo", Text: "msg 0", Namespace: "default"}, - Message{Name: "funcFoo", Text: "msg 1"}, + {Name: "funcFoo", Text: "msg 0", Namespace: "default"}, + {Name: "funcFoo", Text: "msg 1"}, } querier := newFakeQueryRequester(msgs, nil) @@ -73,14 +73,22 @@ func Test_logsHandlerDoesNotLeakGoroutinesWhenClientClosesConnection(t *testing. t.Fatalf("unexpected error sending log request: %s", err) } + errs := make(chan error, 1) go func() { defer resp.Body.Close() _, err := ioutil.ReadAll(resp.Body) if err != context.Canceled { - t.Fatalf("unexpected error reading log response: %s", err) + errs <- err + } else { + errs <- nil } }() cancel() + + err = <-errs + if err != nil { + t.Fatalf("unexpected error reading log response: %s", err) + } } func Test_GETRequestParsing(t *testing.T) {