From 0dd1cf52ad74f00829d6673da19cd5f20dd789d9 Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Wed, 25 Sep 2024 12:55:03 +0800 Subject: [PATCH] resolve conflicts Signed-off-by: Ryan Leung --- tools/pd-ctl/tests/scheduler/scheduler_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/pd-ctl/tests/scheduler/scheduler_test.go b/tools/pd-ctl/tests/scheduler/scheduler_test.go index 7f616f95284c..0c371ba64588 100644 --- 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) {