Merge branch 'master' into add_tso_split_test

tikv · Apr 19, 2023 · 8b5a5d7 · 8b5a5d7
2 parents 0ce3944 + 70b77cd
commit 8b5a5d7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/tests/integrations/mcs/discovery/register_test.go b/tests/integrations/mcs/discovery/register_test.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"strconv"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/suite"
 	bs "github.com/tikv/pd/pkg/basicserver"
@@ -106,6 +107,9 @@ func (suite *serverRegisterTestSuite) checkServerRegister(serviceName string) {
 	endpoints, err = discovery.Discover(client, suite.clusterID, serviceName)
 	re.NoError(err)
 	re.Empty(endpoints)
+	testutil.Eventually(re, func() bool {
+		return !s.IsServing()
+	}, testutil.WithWaitFor(3*time.Second), testutil.WithTickInterval(50*time.Millisecond))
 }
 
 func (suite *serverRegisterTestSuite) TestServerPrimaryChange() {