make test happy

Signed-off-by: husharp <[email protected]>
tikv · Jun 21, 2024 · af36a92 · af36a92
1 parent 41e6376
commit af36a92
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/tests/server/cluster/cluster_test.go b/tests/server/cluster/cluster_test.go
@@ -186,7 +186,7 @@ func TestRegionStatistics(t *testing.T) {
 	re := require.New(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	tc, err := tests.NewTestCluster(ctx, 2)
+	tc, err := tests.NewTestCluster(ctx, 3)
 	defer tc.Destroy()
 	re.NoError(err)
 
@@ -223,9 +223,9 @@ func TestRegionStatistics(t *testing.T) {
 	time.Sleep(1000 * time.Millisecond)
 
 	leaderServer.ResignLeader()
-	newLeaderName := tc.WaitLeader()
-	re.NotEqual(newLeaderName, leaderName)
+	re.NotEqual(tc.WaitLeader(), leaderName)
 	leaderServer = tc.GetLeaderServer()
+	leaderName = leaderServer.GetServer().Name()
 	rc = leaderServer.GetRaftCluster()
 	r := rc.GetRegion(region.Id)
 	re.NotNil(r)
@@ -238,9 +238,9 @@ func TestRegionStatistics(t *testing.T) {
 	re.Len(regions, 1)
 
 	leaderServer.ResignLeader()
-	newLeaderName = tc.WaitLeader()
-	re.Equal(newLeaderName, leaderName)
+	re.NotEqual(tc.WaitLeader(), leaderName)
 	leaderServer = tc.GetLeaderServer()
+	leaderName = leaderServer.GetServer().Name()
 	rc = leaderServer.GetRaftCluster()
 	re.NotNil(r)
 	re.True(r.LoadedFromStorage() || r.LoadedFromSync())
@@ -255,11 +255,13 @@ func TestRegionStatistics(t *testing.T) {
 	re.False(r.LoadedFromStorage() && r.LoadedFromSync())
 
 	leaderServer.ResignLeader()
-	newLeaderName = tc.WaitLeader()
-	re.NotEqual(newLeaderName, leaderName)
+	re.NotEqual(tc.WaitLeader(), leaderName)
+	leaderServer = tc.GetLeaderServer()
+	leaderName = leaderServer.GetServer().Name()
 	leaderServer.ResignLeader()
-	newLeaderName = tc.WaitLeader()
-	re.Equal(newLeaderName, leaderName)
+	re.NotEqual(tc.WaitLeader(), leaderName)
+	leaderServer = tc.GetLeaderServer()
+	leaderName = leaderServer.GetServer().Name()
 	leaderServer = tc.GetLeaderServer()
 	rc = leaderServer.GetRaftCluster()
 	r = rc.GetRegion(region.Id)