Skip to content

Commit

Permalink
Update goleak check and improve goroutine test check
Browse files Browse the repository at this point in the history
Signed-off-by: Manuel Alejandro de Brito Fontes <[email protected]>
  • Loading branch information
aledbf committed Oct 23, 2020
1 parent 38b3731 commit 0f757d5
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions logs/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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) {
Expand Down

0 comments on commit 0f757d5

Please sign in to comment.