resource_manager: make test stable

Signed-off-by: lhy1024 <admin@liudos.us>
tikv · Feb 24, 2023 · 918d2b5 · 918d2b5
1 parent b4379bf
commit 918d2b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/mcs/resource_manager/server/server.go b/pkg/mcs/resource_manager/server/server.go
@@ -250,6 +250,8 @@ func (s *Server) startServer() error {
 	if err != nil {
 		return err
 	}
+	s.cfg.ListenAddr = strings.TrimPrefix(s.cfg.ListenAddr, "http://")
+	s.cfg.ListenAddr = strings.TrimPrefix(s.cfg.ListenAddr, "https://")
 	if tlsConfig != nil {
 		s.muxListener, err = tls.Listen(tcp, s.cfg.ListenAddr, tlsConfig)
 	} else {

diff --git a/tests/mcs/resource_manager/server_test.go b/tests/mcs/resource_manager/server_test.go
@@ -26,6 +26,7 @@ import (
 	rmpb "github.com/pingcap/kvproto/pkg/resource_manager"
 	"github.com/stretchr/testify/require"
 	rm "github.com/tikv/pd/pkg/mcs/resource_manager/server"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 	"github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/tests"
 	"google.golang.org/grpc"
@@ -48,8 +49,7 @@ func TestResourceManagerServer(t *testing.T) {
 
 	cfg := rm.NewConfig()
 	cfg.BackendEndpoints = leader.GetAddr()
-	cfg.ListenAddr = "127.0.0.1:8086"
-
+	cfg.ListenAddr = tempurl.Alloc()
 	svr := rm.NewServer(ctx, cfg)
 	go svr.Run()
 	testutil.Eventually(re, func() bool {