Skip to content

Commit 1aff171

Browse files
ciarams87BobyMCbobs
authored andcommitted
Return new default GRPC client instantiation to every request (kubernetes-sigs#3130)
1 parent 7e0f09d commit 1aff171

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

conformance/utils/grpc/grpc.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@ func validateExpectedResponse(t *testing.T, expected ExpectedResponse) {
270270
func MakeRequestAndExpectEventuallyConsistentResponse(t *testing.T, c Client, timeoutConfig config.TimeoutConfig, gwAddr string, expected ExpectedResponse) {
271271
t.Helper()
272272
validateExpectedResponse(t, expected)
273+
if c == nil {
274+
c = &DefaultClient{Conn: nil}
275+
}
273276
defer c.Close()
274277
sendRPC := func(elapsed time.Duration) bool {
275278
resp, err := c.SendRPC(t, gwAddr, expected, timeoutConfig.MaxTimeToConsistency-elapsed)

conformance/utils/suite/suite.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,6 @@ func NewConformanceTestSuite(options ConformanceOptions) (*ConformanceTestSuite,
193193
}
194194

195195
grpcClient := options.GRPCClient
196-
if grpcClient == nil {
197-
grpcClient = &grpc.DefaultClient{Conn: nil}
198-
}
199196

200197
installedCRDs := &apiextensionsv1.CustomResourceDefinitionList{}
201198
err := options.Client.List(context.TODO(), installedCRDs)

0 commit comments

Comments
 (0)