@@ -5,7 +5,6 @@ package grpc
55
66import (
77 "context"
8- "io"
98 "net"
109 "testing"
1110
@@ -18,16 +17,12 @@ import (
1817 "github.com/jaegertracing/jaeger/proto-gen/api_v2"
1918)
2019
21- func closeTestGrpcConn (t * testing.T , c io.Closer ) {
22- require .NoError (t , c .Close ())
23- }
24-
2520func TestSamplingManager_GetSamplingStrategy (t * testing.T ) {
2621 s , addr := initializeGRPCTestServer (t , func (s * grpc.Server ) {
2722 api_v2 .RegisterSamplingManagerServer (s , & mockSamplingHandler {})
2823 })
2924 conn , err := grpc .NewClient (addr .String (), grpc .WithTransportCredentials (insecure .NewCredentials ()))
30- defer closeTestGrpcConn (t , conn )
25+ t . Cleanup ( func () { require . NoError (t , conn . Close ()) } )
3126 require .NoError (t , err )
3227 defer s .GracefulStop ()
3328 manager := NewConfigManager (conn )
@@ -38,7 +33,7 @@ func TestSamplingManager_GetSamplingStrategy(t *testing.T) {
3833
3934func TestSamplingManager_GetSamplingStrategy_error (t * testing.T ) {
4035 conn , err := grpc .NewClient ("foo" , grpc .WithTransportCredentials (insecure .NewCredentials ()))
41- defer closeTestGrpcConn (t , conn )
36+ t . Cleanup ( func () { require . NoError (t , conn . Close ()) } )
4237 require .NoError (t , err )
4338 manager := NewConfigManager (conn )
4439 resp , err := manager .GetSamplingStrategy (context .Background (), "any" )
0 commit comments