@@ -16,11 +16,11 @@ import (
1616var queryTimeout = 30 * time .Second
1717
1818func Test_logsHandlerDoesNotLeakGoroutinesWhenProviderClosesStream (t * testing.T ) {
19- defer goleak .VerifyNoLeaks (t )
19+ defer goleak .VerifyNone (t )
2020
2121 msgs := []Message {
22- Message {Name : "funcFoo" , Text : "msg 0" , Namespace : "default" },
23- Message {Name : "funcFoo" , Text : "msg 1" },
22+ {Name : "funcFoo" , Text : "msg 0" , Namespace : "default" },
23+ {Name : "funcFoo" , Text : "msg 1" },
2424 }
2525
2626 var expected bytes.Buffer
@@ -51,11 +51,11 @@ func Test_logsHandlerDoesNotLeakGoroutinesWhenProviderClosesStream(t *testing.T)
5151}
5252
5353func Test_logsHandlerDoesNotLeakGoroutinesWhenClientClosesConnection (t * testing.T ) {
54- defer goleak .VerifyNoLeaks (t )
54+ defer goleak .VerifyNone (t )
5555
5656 msgs := []Message {
57- Message {Name : "funcFoo" , Text : "msg 0" , Namespace : "default" },
58- Message {Name : "funcFoo" , Text : "msg 1" },
57+ {Name : "funcFoo" , Text : "msg 0" , Namespace : "default" },
58+ {Name : "funcFoo" , Text : "msg 1" },
5959 }
6060
6161 querier := newFakeQueryRequester (msgs , nil )
@@ -73,14 +73,22 @@ func Test_logsHandlerDoesNotLeakGoroutinesWhenClientClosesConnection(t *testing.
7373 t .Fatalf ("unexpected error sending log request: %s" , err )
7474 }
7575
76+ errs := make (chan error , 1 )
7677 go func () {
7778 defer resp .Body .Close ()
7879 _ , err := ioutil .ReadAll (resp .Body )
7980 if err != context .Canceled {
80- t .Fatalf ("unexpected error reading log response: %s" , err )
81+ errs <- err
82+ } else {
83+ errs <- nil
8184 }
8285 }()
8386 cancel ()
87+
88+ err = <- errs
89+ if err != nil {
90+ t .Fatalf ("unexpected error reading log response: %s" , err )
91+ }
8492}
8593
8694func Test_GETRequestParsing (t * testing.T ) {
0 commit comments