tests: fix PR 10963 CI failures

Signed-off-by: Ryan Leung <rleungx@gmail.com>

Author: rleungx

pkg/mcs/server/server.go

@@ -268,13 +268,13 @@ func replacePort(addr, actualListenAddr string) string {
 	return net.JoinHostPort(host, actualPort)
 }
 
-func splitHostPort(addr string) (string, string, bool) {
+func splitHostPort(addr string) (host, port string, ok bool) {
 	parsed, err := url.Parse(addr)
-	host := addr
+	host = addr
 	if err == nil && parsed.Host != "" {
 		host = parsed.Host
 	}
-	_, port, err := net.SplitHostPort(host)
+	_, port, err = net.SplitHostPort(host)
 	if err != nil {
 		return "", "", false
 	}

tools/pd-ctl/tests/store/store_test.go

@@ -35,6 +35,7 @@ import (
 	"github.com/tikv/pd/pkg/response"
 	"github.com/tikv/pd/pkg/statistics/utils"
 	"github.com/tikv/pd/pkg/utils/grpcutil"
+	"github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/server/config"
 	pdTests "github.com/tikv/pd/tests"
 	ctl "github.com/tikv/pd/tools/pd-ctl/pdctl"
@@ -285,9 +286,11 @@ func (s *storeTestSuite) checkStore(cluster *pdTests.TestCluster) {
 	re.NoError(leaderServer.Run())
 
 	re.NotEmpty(cluster.WaitLeader())
-	storesLimit := leaderServer.GetPersistOptions().GetAllStoresLimit()
-	re.Equal(float64(20), storesLimit[1].AddPeer)
-	re.Equal(float64(20), storesLimit[1].RemovePeer)
+	testutil.Eventually(re, func() bool {
+		storesLimit := leaderServer.GetPersistOptions().GetAllStoresLimit()
+		limit, ok := storesLimit[1]
+		return ok && limit.AddPeer == float64(20) && limit.RemovePeer == float64(20)
+	})
 
 	// store limit all <rate> <type>
 	args = []string{"-u", pdAddr, "store", "limit", "all", "25", "remove-peer"}