From e6bed4213b0f20aec25d6746054578786c59a52f Mon Sep 17 00:00:00 2001 From: JmPotato Date: Tue, 21 Nov 2023 17:29:46 +0800 Subject: [PATCH] Fix the HTTP handler tests Signed-off-by: JmPotato --- pkg/server/handler/tests/BUILD.bazel | 1 + pkg/server/handler/tests/http_handler_test.go | 15 ++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkg/server/handler/tests/BUILD.bazel b/pkg/server/handler/tests/BUILD.bazel index 7acaf6cb34af5..f992b3170f853 100644 --- a/pkg/server/handler/tests/BUILD.bazel +++ b/pkg/server/handler/tests/BUILD.bazel @@ -28,6 +28,7 @@ go_test( "//pkg/server/handler/optimizor", "//pkg/server/handler/tikvhandler", "//pkg/server/internal/testserverclient", + "//pkg/server/internal/testutil", "//pkg/server/internal/util", "//pkg/session", "//pkg/sessionctx", diff --git a/pkg/server/handler/tests/http_handler_test.go b/pkg/server/handler/tests/http_handler_test.go index 4113a3ef42675..7610e5d3d9bac 100644 --- a/pkg/server/handler/tests/http_handler_test.go +++ b/pkg/server/handler/tests/http_handler_test.go @@ -50,6 +50,7 @@ import ( "github.com/pingcap/tidb/pkg/server/handler/optimizor" "github.com/pingcap/tidb/pkg/server/handler/tikvhandler" "github.com/pingcap/tidb/pkg/server/internal/testserverclient" + "github.com/pingcap/tidb/pkg/server/internal/testutil" "github.com/pingcap/tidb/pkg/server/internal/util" "github.com/pingcap/tidb/pkg/session" "github.com/pingcap/tidb/pkg/sessionctx" @@ -449,13 +450,7 @@ func TestBinlogRecover(t *testing.T) { func (ts *basicHTTPHandlerTestSuite) startServer(t *testing.T) { var err error - ts.Port = uint(rand.Int31n(50000)) + 10000 - ts.StatusPort = ts.Port + 1 - ts.store, err = mockstore.NewMockStore( - mockstore.WithTiKVOptions( - tikv.WithPDHTTPClient([]string{ts.Addr()}), - ), - ) + ts.store, err = mockstore.NewMockStore() require.NoError(t, err) ts.domain, err = session.BootstrapSession(ts.store) require.NoError(t, err) @@ -463,12 +458,14 @@ func (ts *basicHTTPHandlerTestSuite) startServer(t *testing.T) { cfg := util.NewTestConfig() cfg.Store = "tikv" - cfg.Port = ts.Port - cfg.Status.StatusPort = ts.StatusPort + cfg.Port = 0 + cfg.Status.StatusPort = 0 cfg.Status.ReportStatus = true server, err := server2.NewServer(cfg, ts.tidbdrv) require.NoError(t, err) + ts.Port = testutil.GetPortFromTCPAddr(server.ListenAddr()) + ts.StatusPort = testutil.GetPortFromTCPAddr(server.StatusListenerAddr()) ts.server = server ts.server.SetDomain(ts.domain) go func() {