Replace failpoint with testing.Testing() to polish codes.

Signed-off-by: lucasliang <[email protected]>

pkg/schedule/coordinator.go

@@ -19,6 +19,7 @@ import (
 	"context"
 	"strconv"
 	"sync"
+	"testing"
 	"time"
 
 	"github.com/pingcap/errors"
@@ -639,9 +640,9 @@ func (c *Coordinator) ResetHotSpotMetrics() {
 // ShouldRun returns true if the coordinator should run.
 func (c *Coordinator) ShouldRun() bool {
 	isSynced := c.cluster.GetStoreConfig().IsSynced()
-	failpoint.Inject("mockStoreConfigSynced", func() {
+	if testing.Testing() {
 		isSynced = true
-	})
+	}
 	return c.prepareChecker.check(c.cluster.GetBasicCluster()) && isSynced
 }
 

tests/integrations/mcs/scheduling/config_test.go

@@ -142,7 +142,13 @@ func (suite *configTestSuite) TestSchedulerConfigWatch() {
 	)
 	testutil.Eventually(re, func() bool {
 		schedulerNames = schedulerController.GetSchedulerNames()
-		return len(schedulerNames) == len(sc.DefaultSchedulers)
+		targetCount := len(sc.DefaultSchedulers)
+		// In the previous case, StoreConfig of raft-kv2 has been persisted. So, it might
+		// have EvictSlowTrendName.
+		if exists, _ := schedulerController.IsSchedulerExisted(schedulers.EvictSlowTrendName); exists {
+			targetCount += 1
+		}
+		return len(schedulerNames) == targetCount
 	})
 	// Check all default schedulers' configs.
 	for _, schedulerName := range schedulerNames {

tests/pdctl/scheduler/scheduler_test.go

@@ -20,7 +20,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/stretchr/testify/require"
 	sc "github.com/tikv/pd/pkg/schedule/config"
@@ -33,7 +32,6 @@ import (
 
 func TestScheduler(t *testing.T) {
 	re := require.New(t)
-	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/schedule/mockStoreConfigSynced", "return(true)"))
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	cluster, err := tests.NewTestCluster(ctx, 1)
@@ -487,5 +485,4 @@ func TestScheduler(t *testing.T) {
 	err = leaderServer.GetServer().SetScheduleConfig(*cfg)
 	re.NoError(err)
 	checkSchedulerWithStatusCommand(nil, "disabled", nil)
-	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/schedule/mockStoreConfigSynced"))
 }