cherry pick pingcap#33246 to release-6.0

Signed-off-by: ti-srebot <[email protected]>
ti-srebot · Mar 21, 2022 · 2e01c9e · 2e01c9e
1 parent e130e52
commit 2e01c9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/privilege/privileges/main_test.go b/privilege/privileges/main_test.go
@@ -27,6 +27,8 @@ func TestMain(m *testing.M) {
 		goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"),
 		goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"),
 		goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
+		goleak.IgnoreTopFunction("net/http.(*persistConn).writeLoop"),
+		goleak.IgnoreTopFunction("internal/poll.runtime_pollWait"),
 	}
 	testbridge.SetupForCommonTest()
 

diff --git a/server/stat_test.go b/server/stat_test.go
@@ -52,6 +52,8 @@ func TestUptime(t *testing.T) {
 	tidbdrv := NewTiDBDriver(store)
 	cfg := newTestConfig()
 	cfg.Socket = ""
+	cfg.Port = 0
+	cfg.Status.StatusPort = 0
 	server, err := NewServer(cfg, tidbdrv)
 	require.NoError(t, err)