Merge branch 'master' into not_pushdown_to_tiflash_in_some_cases

pingcap · Mar 12, 2021 · 5691d88 · 5691d88
2 parents a8c4aa5 + 0b68d8a
commit 5691d88
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/executor/tiflash_test.go b/executor/tiflash_test.go
@@ -33,7 +33,6 @@ import (
 	"github.com/pingcap/tidb/store/mockstore/unistore"
 	"github.com/pingcap/tidb/store/tikv/mockstore/cluster"
 	"github.com/pingcap/tidb/util/testkit"
-	"github.com/pingcap/tidb/util/testleak"
 )
 
 type tiflashTestSuite struct {
@@ -43,7 +42,6 @@ type tiflashTestSuite struct {
 }
 
 func (s *tiflashTestSuite) SetUpSuite(c *C) {
-	testleak.BeforeTest()
 	var err error
 	s.store, err = mockstore.NewMockStore(
 		mockstore.WithClusterInspector(func(c cluster.Cluster) {
@@ -331,7 +329,6 @@ func (s *tiflashTestSuite) TestCancelMppTasks(c *C) {
 
 // all goroutines exit if one goroutine hangs but another return errors
 func (s *tiflashTestSuite) TestMppGoroutinesExitFromErrors(c *C) {
-	defer testleak.AfterTest(c)()
 	// mock non-root tasks return error
 	var mppNonRootTaskError = "github.com/pingcap/tidb/store/copr/mppNonRootTaskError"
 	// mock root tasks hang