test: fix unstable test TestClearCache (#51480) (#53448)

close #50743
pingcap · May 23, 2024 · 9e0434f · 9e0434f
1 parent 001c1ff
commit 9e0434f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
 		}