From 92d34784831bf2eba6503ee606629e63f7a103d3 Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Thu, 10 Aug 2023 19:47:50 +0800 Subject: [PATCH 1/2] *: remove skip Signed-off-by: Weizhen Wang --- executor/merge_join_test.go | 4 +--- executor/test/analyzetest/analyze_test.go | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/executor/merge_join_test.go b/executor/merge_join_test.go index e03e6baca51c2..c41e2bf3d798b 100644 --- a/executor/merge_join_test.go +++ b/executor/merge_join_test.go @@ -281,9 +281,7 @@ func TestShuffleMergeJoinInDisk(t *testing.T) { } func TestMergeJoinInDisk(t *testing.T) { - t.Skip("unstable, skip it and fix it before 20210618") - restore := config.RestoreFunc() - defer restore() + defer config.RestoreFunc()() config.UpdateGlobal(func(conf *config.Config) { conf.TempStoragePath = t.TempDir() }) diff --git a/executor/test/analyzetest/analyze_test.go b/executor/test/analyzetest/analyze_test.go index 11e168105fab9..3f527be85010c 100644 --- a/executor/test/analyzetest/analyze_test.go +++ b/executor/test/analyzetest/analyze_test.go @@ -551,7 +551,6 @@ func TestDefaultValForAnalyze(t *testing.T) { } func TestAnalyzeFullSamplingOnIndexWithVirtualColumnOrPrefixColumn(t *testing.T) { - t.Skip("unstable, skip it and fix it before 20210624") store := testkit.CreateMockStore(t) tk := testkit.NewTestKit(t, store) From 1778b2ecad446d212fd5d359f4232b9820f222da Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Fri, 11 Aug 2023 00:18:25 +0800 Subject: [PATCH 2/2] *: remove skip Signed-off-by: Weizhen Wang --- executor/infoschema_reader_test.go | 1 - planner/core/prepare_test.go | 10 +++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/executor/infoschema_reader_test.go b/executor/infoschema_reader_test.go index 1b8e044971334..597e6e8f7be5a 100644 --- a/executor/infoschema_reader_test.go +++ b/executor/infoschema_reader_test.go @@ -39,7 +39,6 @@ import ( ) func TestInspectionTables(t *testing.T) { - t.Skip("unstable, skip it and fix it before 20210624") store := testkit.CreateMockStore(t) tk := testkit.NewTestKit(t, store) instances := []string{ diff --git a/planner/core/prepare_test.go b/planner/core/prepare_test.go index c4d31a6aaceff..66a9dbd141289 100644 --- a/planner/core/prepare_test.go +++ b/planner/core/prepare_test.go @@ -24,6 +24,7 @@ import ( "testing" "time" + "github.com/pingcap/tidb/errno" "github.com/pingcap/tidb/executor" "github.com/pingcap/tidb/expression" "github.com/pingcap/tidb/infoschema" @@ -31,7 +32,6 @@ import ( "github.com/pingcap/tidb/metrics" "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/parser/auth" - "github.com/pingcap/tidb/parser/terror" "github.com/pingcap/tidb/planner/core" "github.com/pingcap/tidb/session" "github.com/pingcap/tidb/sessionctx/variable" @@ -720,7 +720,6 @@ func TestPrepareCacheNow(t *testing.T) { } func TestPrepareOverMaxPreparedStmtCount(t *testing.T) { - t.Skip("unstable, skip it and fix it before 20210705") store := testkit.CreateMockStore(t) tk := testkit.NewTestKit(t, store) tk.MustExec("use test") @@ -752,18 +751,15 @@ func TestPrepareOverMaxPreparedStmtCount(t *testing.T) { for i := 1; ; i++ { prePrepared = readGaugeInt(metrics.PreparedStmtGauge) if prePrepared >= 2 { - _, err := tk.Exec(`prepare stmt` + strconv.Itoa(i) + ` from "select 1"`) - require.True(t, terror.ErrorEqual(err, variable.ErrMaxPreparedStmtCountReached)) + tk.MustGetErrCode(`prepare stmt`+strconv.Itoa(i)+` from "select 1"`, errno.ErrMaxPreparedStmtCountReached) break } - _, err := tk.Exec(`prepare stmt` + strconv.Itoa(i) + ` from "select 1"`) - require.NoError(t, err) + tk.MustExec(`prepare stmt` + strconv.Itoa(i) + ` from "select 1"`) } } // unit test for issue https://github.com/pingcap/tidb/issues/8518 func TestPrepareTableAsNameOnGroupByWithCache(t *testing.T) { - t.Skip("unstable, skip it and fix it before 20210702") store := testkit.CreateMockStore(t) tk := testkit.NewTestKit(t, store) tk.MustExec(`set tidb_enable_prepared_plan_cache=1`)