test: speed up test that was taking 10 seconds to timeout (#6531)

dfawley · web-flow · commit 3fa17cc18fc0 · 2023-08-09T14:40:15.000-07:00
diff --git a/test/creds_test.go b/test/creds_test.go
@@ -270,10 +270,11 @@ func (s) TestWaitForReadyRPCErrorOnBadCertificates(t *testing.T) {
 	defer cc.Close()
 
 	tc := testgrpc.NewTestServiceClient(cc)
-	if _, err = tc.EmptyCall(ctx, &testpb.Empty{}, grpc.WaitForReady(true)); strings.Contains(err.Error(), clientAlwaysFailCredErrorMsg) {
-		return
+	ctx, cancel = context.WithTimeout(context.Background(), defaultTestShortTimeout)
+	defer cancel()
+	if _, err = tc.EmptyCall(ctx, &testpb.Empty{}, grpc.WaitForReady(true)); !strings.Contains(err.Error(), clientAlwaysFailCredErrorMsg) {
+		t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want err.Error() contains %q", err, clientAlwaysFailCredErrorMsg)
 	}
-	te.t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want err.Error() contains %q", err, clientAlwaysFailCredErrorMsg)
 }
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -270,10 +270,11 @@ func (s) TestWaitForReadyRPCErrorOnBadCertificates(t *testing.T) {`
`270`	`270`	`defer cc.Close()`
`271`	`271`
`272`	`272`	`tc := testgrpc.NewTestServiceClient(cc)`
`273`		`- if _, err = tc.EmptyCall(ctx, &testpb.Empty{}, grpc.WaitForReady(true)); strings.Contains(err.Error(), clientAlwaysFailCredErrorMsg) {`
`274`		`- return`
	`273`	`+ ctx, cancel = context.WithTimeout(context.Background(), defaultTestShortTimeout)`
	`274`	`+ defer cancel()`
	`275`	`+ if _, err = tc.EmptyCall(ctx, &testpb.Empty{}, grpc.WaitForReady(true)); !strings.Contains(err.Error(), clientAlwaysFailCredErrorMsg) {`
	`276`	`+ t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want err.Error() contains %q", err, clientAlwaysFailCredErrorMsg)`
`275`	`277`	`}`
`276`		`- te.t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want err.Error() contains %q", err, clientAlwaysFailCredErrorMsg)`
`277`	`278`	`}`
`278`	`279`
`279`	`280`	`var (`