resolve conflicts

Signed-off-by: Ryan Leung <[email protected]>
tikv · Sep 25, 2024 · 0dd1cf5 · 0dd1cf5
1 parent d782efd
commit 0dd1cf5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tools/pd-ctl/tests/scheduler/scheduler_test.go b/tools/pd-ctl/tests/scheduler/scheduler_test.go
@@ -661,7 +661,7 @@ func (suite *schedulerTestSuite) checkScheduler(cluster *pdTests.TestCluster) {
 }
 
 func (suite *schedulerTestSuite) TestSchedulerDiagnostic() {
-	suite.env.RunTestInAPIMode(suite.checkSchedulerDiagnostic)
+	suite.env.RunTestInTwoModes(suite.checkSchedulerDiagnostic)
 }
 
 func (suite *schedulerTestSuite) checkSchedulerDiagnostic(cluster *pdTests.TestCluster) {
@@ -723,7 +723,7 @@ func (suite *schedulerTestSuite) checkSchedulerDiagnostic(cluster *pdTests.TestC
 }
 
 func (suite *schedulerTestSuite) TestEvictLeaderScheduler() {
-	suite.env.RunFuncInTwoModes(suite.checkEvictLeaderScheduler)
+	suite.env.RunTestInTwoModes(suite.checkEvictLeaderScheduler)
 }
 
 func (suite *schedulerTestSuite) checkEvictLeaderScheduler(cluster *pdTests.TestCluster) {