*: fix TestKeyspaceGroupMergeIntoDefault (#8056)

close #6991 Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
tikv · Apr 11, 2024 · 8f7999e · 8f7999e
1 parent 39f5712
commit 8f7999e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/tests/integrations/mcs/tso/keyspace_group_manager_test.go b/tests/integrations/mcs/tso/keyspace_group_manager_test.go
@@ -793,9 +793,11 @@ func (suite *tsoKeyspaceGroupManagerTestSuite) TestKeyspaceGroupMergeIntoDefault
 	// Check if the first keyspace group is served.
 	svr := suite.tsoCluster.WaitForDefaultPrimaryServing(re)
 	re.NotNil(svr)
-	// Check if the last keyspace group is served.
-	svr = suite.tsoCluster.WaitForPrimaryServing(re, uint32(keyspaceGroupNum), uint32(keyspaceGroupNum))
-	re.NotNil(svr)
+	for i := 1; i < keyspaceGroupNum; i++ {
+		// Check if the keyspace group is served.
+		svr = suite.tsoCluster.WaitForPrimaryServing(re, uint32(i), uint32(i))
+		re.NotNil(svr)
+	}
 	// Merge all the keyspace groups into the default keyspace group.
 	handlersutil.MustMergeKeyspaceGroup(re, suite.pdLeaderServer, mcsutils.DefaultKeyspaceGroupID, &handlers.MergeKeyspaceGroupsParams{
 		MergeAllIntoDefault: true,