fix ci

Signed-off-by: husharp <jinhao.hu@pingcap.com>
tikv · Jan 29, 2024 · 25cb7fc · 25cb7fc
1 parent 55abebd
commit 25cb7fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/tests/integrations/client/client_test.go b/tests/integrations/client/client_test.go
@@ -77,21 +77,19 @@ func TestClientClusterIDCheck(t *testing.T) {
 	defer cluster2.Destroy()
 	endpoints2 := runServer(re, cluster2)
 	// Try to create a client with the mixed endpoints.
-	cli, err := pd.NewClientWithContext(
+	_, err = pd.NewClientWithContext(
 		ctx, append(endpoints1, endpoints2...),
 		pd.SecurityOption{}, pd.WithMaxErrorRetry(1),
 	)
 	re.Error(err)
-	defer cli.Close()
 	re.Contains(err.Error(), "unmatched cluster id")
 	// updateMember should fail due to unmatched cluster ID found.
 	re.NoError(failpoint.Enable("github.com/tikv/pd/client/skipClusterIDCheck", `return(true)`))
 	re.NoError(failpoint.Enable("github.com/tikv/pd/client/skipFirstUpdateMember", `return(true)`))
-	cli, err = pd.NewClientWithContext(ctx, []string{endpoints1[0], endpoints2[0]},
+	_, err = pd.NewClientWithContext(ctx, []string{endpoints1[0], endpoints2[0]},
 		pd.SecurityOption{}, pd.WithMaxErrorRetry(1),
 	)
 	re.Error(err)
-	defer cli.Close()
 	re.Contains(err.Error(), "ErrClientGetMember")
 	re.NoError(failpoint.Disable("github.com/tikv/pd/client/skipFirstUpdateMember"))
 	re.NoError(failpoint.Disable("github.com/tikv/pd/client/skipClusterIDCheck"))

diff --git a/tests/integrations/client/client_tls_test.go b/tests/integrations/client/client_tls_test.go
@@ -173,12 +173,12 @@ func testTLSReload(
 				CertPath: testClientTLSInfo.CertFile,
 				KeyPath:  testClientTLSInfo.KeyFile,
 			}, pd.WithGRPCDialOptions(grpc.WithBlock()))
-			cli.Close()
 			if err != nil {
 				errc <- err
 				dcancel()
 				return
 			}
+			cli.Close()
 			dcancel()
 		}
 	}()