From b01942d53abbd9fbf3ed88ee5fe6a7ba121e0854 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Mon, 4 Mar 2024 19:51:34 +0800 Subject: [PATCH] test: fix unstable test TestClearCache (#51480) close pingcap/tidb#50743 --- br/pkg/streamhelper/advancer_test.go | 6 +++--- br/pkg/streamhelper/basic_lib_for_test.go | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/br/pkg/streamhelper/advancer_test.go b/br/pkg/streamhelper/advancer_test.go index 1cd41dd0daa87..a3beb6b034ff9 100644 --- a/br/pkg/streamhelper/advancer_test.go +++ b/br/pkg/streamhelper/advancer_test.go @@ -258,7 +258,7 @@ func TestClearCache(t *testing.T) { c.splitAndScatter("0012", "0034", "0048") clearedCache := make(map[uint64]bool) - c.onGetClient = func(u uint64) error { + c.onClearCache = func(u uint64) error { // make store u cache cleared clearedCache[u] = true return nil @@ -270,7 +270,7 @@ func TestClearCache(t *testing.T) { s.onGetRegionCheckpoint = func(glftrr *logbackup.GetLastFlushTSOfRegionRequest) error { // mark this store cache cleared failedStoreID = s.GetID() - if hasFailed { + if !hasFailed { hasFailed = true return errors.New("failed to get checkpoint") } @@ -287,7 +287,7 @@ func TestClearCache(t *testing.T) { shouldFinishInTime(t, time.Second, "ticking", func() { err = adv.OnTick(ctx) }) - req.NoError(err) + req.Error(err) req.True(failedStoreID > 0, "failed to mark the cluster: ") req.Equal(clearedCache[failedStoreID], true) } diff --git a/br/pkg/streamhelper/basic_lib_for_test.go b/br/pkg/streamhelper/basic_lib_for_test.go index 39e79e9b1a496..ac5a5009b57e0 100644 --- a/br/pkg/streamhelper/basic_lib_for_test.go +++ b/br/pkg/streamhelper/basic_lib_for_test.go @@ -100,6 +100,7 @@ type fakeCluster struct { testCtx *testing.T onGetClient func(uint64) error + onClearCache func(uint64) error serviceGCSafePoint uint64 } @@ -320,8 +321,8 @@ func (f *fakeCluster) GetLogBackupClient(ctx context.Context, storeID uint64) (l } func (f *fakeCluster) ClearCache(ctx context.Context, storeID uint64) error { - if f.onGetClient != nil { - err := f.onGetClient(storeID) + if f.onClearCache != nil { + err := f.onClearCache(storeID) if err != nil { return err }