*: remove skip (pingcap#45974)

ref pingcap#45985
qw4990 · Aug 11, 2023 · cfefc83 · cfefc83
1 parent c7c7000
commit cfefc83
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git 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/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
@@ -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)
 

diff --git a/planner/core/prepare_test.go b/planner/core/prepare_test.go
@@ -24,14 +24,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/pingcap/tidb/errno"
 	"github.com/pingcap/tidb/executor"
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/infoschema"
 	"github.com/pingcap/tidb/kv"
 	"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`)