From ec89da007f89495ae17a2b6242925e2ad1d4e48e Mon Sep 17 00:00:00 2001 From: rebelice Date: Wed, 16 Jun 2021 17:37:35 +0800 Subject: [PATCH 1/2] statistics: fix two unstable tests --- statistics/handle/handle_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/statistics/handle/handle_test.go b/statistics/handle/handle_test.go index 185d6b296ecd5..54f90c2a55d6a 100644 --- a/statistics/handle/handle_test.go +++ b/statistics/handle/handle_test.go @@ -38,6 +38,7 @@ import ( "github.com/pingcap/tidb/util/collate" "github.com/pingcap/tidb/util/ranger" "github.com/pingcap/tidb/util/testkit" + "github.com/pingcap/tidb/util/israce" "github.com/tikv/client-go/v2/oracle" ) @@ -882,7 +883,9 @@ func (s *testStatsSuite) checkForGlobalStatsWithOpts(c *C, tk *testkit.TestKit, } func (s *testStatsSuite) TestAnalyzeGlobalStatsWithOpts(c *C) { - c.Skip("unstable, skip race test") + if israce.RaceEnabled { + c.Skip("exhaustive types test, skip race test") + } defer cleanEnv(c, s.store, s.do) tk := testkit.NewTestKit(c, s.store) s.prepareForGlobalStatsWithOpts(c, tk, "test_gstats_opt", "test_gstats_opt") @@ -918,7 +921,9 @@ func (s *testStatsSuite) TestAnalyzeGlobalStatsWithOpts(c *C) { } func (s *testStatsSuite) TestAnalyzeGlobalStatsWithOpts2(c *C) { - c.Skip("unstable, skip race test") + if israce.RaceEnabled { + c.Skip("exhaustive types test, skip race test") + } defer cleanEnv(c, s.store, s.do) tk := testkit.NewTestKit(c, s.store) s.prepareForGlobalStatsWithOpts(c, tk, "test_gstats_opt2", "test_gstats_opt2") From 2ab8c27852f997587ebb548e16fddd24d4f0a40e Mon Sep 17 00:00:00 2001 From: rebelice Date: Wed, 16 Jun 2021 19:37:58 +0800 Subject: [PATCH 2/2] fmt --- statistics/handle/handle_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/statistics/handle/handle_test.go b/statistics/handle/handle_test.go index 54f90c2a55d6a..36b39b8c0f46f 100644 --- a/statistics/handle/handle_test.go +++ b/statistics/handle/handle_test.go @@ -36,9 +36,9 @@ import ( "github.com/pingcap/tidb/store/mockstore" "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/util/collate" + "github.com/pingcap/tidb/util/israce" "github.com/pingcap/tidb/util/ranger" "github.com/pingcap/tidb/util/testkit" - "github.com/pingcap/tidb/util/israce" "github.com/tikv/client-go/v2/oracle" )