addressing review comments

clientconn_test.go

@@ -385,7 +385,7 @@ func (s) TestBackoffWhenNoServerPrefaceReceived(t *testing.T) {
 	}
 	cc, err := NewClient(lis.Addr().String(), WithTransportCredentials(insecure.NewCredentials()), WithConnectParams(cp))
 	if err != nil {
-		t.Fatalf("Unexpected error from NewClient(%v) = %v", lis.Addr(), err)
+		t.Fatalf("Failed to create a client for server: %v", err)
 	}
 	defer cc.Close()
 	go stayConnected(cc)
@@ -624,7 +624,7 @@ func testBackoffConfigSet(t *testing.T, wantBackoff internalbackoff.Exponential,
 	opts = append(opts, WithTransportCredentials(insecure.NewCredentials()))
 	conn, err := NewClient("passthrough:///foo:80", opts...)
 	if err != nil {
-		t.Fatalf("unexpected error newclient connection: %v", err)
+		t.Fatalf("Failed to create a client for server: %v", err)
 	}
 	defer conn.Close()
 
@@ -813,6 +813,7 @@ func (s) TestMethodConfigDefaultService(t *testing.T) {
 	}
 	cc.Connect()
 	defer cc.Close()
+
 	m := cc.GetMethodConfig("/foo/Bar")
 	if m.WaitForReady == nil {
 		t.Fatalf("want: method (%q) config to fallback to the default service", "/foo/Bar")
@@ -888,12 +889,12 @@ func (s) TestResetConnectBackoff(t *testing.T) {
 	select {
 	case <-dials:
 	case <-time.NewTimer(10 * time.Second).C:
-		t.Fatal("Failed to call NewClient within 10s")
+		t.Fatal("Failed to call dial within 10s")
 	}
 
 	select {
 	case <-dials:
-		t.Fatal("NewClient called unexpectedly before resetting backoff")
+		t.Fatal("Dial called unexpectedly before resetting backoff")
 	case <-time.NewTimer(100 * time.Millisecond).C:
 	}
 
@@ -902,18 +903,18 @@ func (s) TestResetConnectBackoff(t *testing.T) {
 	select {
 	case <-dials:
 	case <-time.NewTimer(10 * time.Second).C:
-		t.Fatal("Failed to call NewClient within 10s after resetting backoff")
+		t.Fatal("Failed to call dial within 10s after resetting backoff")
 	}
 }
 
 func (s) TestBackoffCancel(t *testing.T) {
 	dialStrCh := make(chan string)
 	cc, err := NewClient("passthrough:///", WithTransportCredentials(insecure.NewCredentials()), WithDialer(func(t string, _ time.Duration) (net.Conn, error) {
 		dialStrCh <- t
-		return nil, fmt.Errorf("Failed to create a client")
+		return nil, fmt.Errorf("test dialer, always error")
 	}))
 	if err != nil {
-		t.Fatalf("Failed to create ClientConn: %v", err)
+		t.Fatalf("Failed to create a client for server: %v", err)
 	}
 	cc.Connect()
 	defer cc.Close()

test/gracefulstop_test.go

@@ -138,8 +138,6 @@ func (s) TestGracefulStop(t *testing.T) {
 
 	<-dlis.closeCalled // Block until GracefulStop calls dlis.Close()
 
-	// Attempt to dial the server using a custom dialer. Since the listener is
-	// already closed, no new connections should be established.
 	dialer := func(ctx context.Context, _ string) (net.Conn, error) { return dlis.Dial(ctx) }
 	cc, err := grpc.NewClient("passthrough:///", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(dialer))
 	if err != nil {
@@ -151,6 +149,8 @@ func (s) TestGracefulStop(t *testing.T) {
 	// 4. Make an RPC.
 	// The server would send a GOAWAY first, but we are delaying the server's
 	// writes for now until the client writes more than the preface.
+	// This will cause a connection to be accepted. This will
+	// also unblock the Close method.
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
 	if _, err = client.FullDuplexCall(ctx); err == nil || status.Code(err) != codes.Unavailable {
 		t.Fatalf("FullDuplexCall= _, %v; want _, <status code Unavailable>", err)

xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go

@@ -536,7 +536,6 @@ func (s) TestSecurityConfigUpdate_BadToGood(t *testing.T) {
 	// Create a grpc channel with xDS creds talking to a test server with TLS
 	// credentials.
 	cc, serverAddress := setupForSecurityTests(t, bc, xdsClientCredsWithInsecureFallback(t), tlsServerCreds(t))
-	defer cc.Close()
 	cc.Connect()
 	// Configure cluster and endpoints resources in the management server. The
 	// cluster resource contains security configuration with a certificate