*: remove pingcap/check dependency

br/pkg/stream/decode_kv_test.go

@@ -3,22 +3,13 @@
 package stream_test
 
 import (
-	"bytes"
 	"testing"
 
-	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/br/pkg/stream"
+	"github.com/stretchr/testify/require"
 )
 
-type testDecodeKVSuite struct{}
-
-func TestT(t *testing.T) {
-	TestingT(t)
-}
-
-var _ = Suite(&testDecodeKVSuite{})
-
-func (s *testDecodeKVSuite) TestDecodeKVEntry(c *C) {
+func TestDecodeKVEntry(t *testing.T) {
 	var (
 		pairs = map[string]string{
 			"db":       "tidb",
@@ -37,17 +28,17 @@ func (s *testDecodeKVSuite) TestDecodeKVEntry(c *C) {
 	for ei.Valid() {
 		ei.Next()
 		err := ei.GetError()
-		c.Assert(err, IsNil)
+		require.NoError(t, err)
 
 		key := ei.Key()
 		value := ei.Value()
 		v, exist := pairs[string(key)]
-		c.Assert(exist, IsTrue)
-		c.Assert(string(value), Equals, v)
+		require.True(t, exist)
+		require.Equal(t, v, string(value))
 	}
 }
 
-func (s *testDecodeKVSuite) TestDecodeKVEntryError(c *C) {
+func TestDecodeKVEntryError(t *testing.T) {
 	var (
 		k    = []byte("db")
 		v    = []byte("tidb")
@@ -59,10 +50,10 @@ func (s *testDecodeKVSuite) TestDecodeKVEntryError(c *C) {
 
 	ei := stream.NewEventIterator(buff)
 	ei.Next()
-	c.Assert(bytes.Equal(k, ei.Key()), IsTrue)
-	c.Assert(bytes.Equal(v, ei.Value()), IsTrue)
-	c.Assert(ei.Valid(), IsTrue)
+	require.Equal(t, k, ei.Key())
+	require.Equal(t, v, ei.Value())
+	require.True(t, ei.Valid())
 
 	ei.Next()
-	c.Assert(ei.GetError(), NotNil)
+	require.Error(t, ei.GetError())
 }

br/pkg/stream/meta_kv_test.go

@@ -4,24 +4,21 @@ package stream
 
 import (
 	"bytes"
+	"testing"
 
-	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/tablecodec"
 	"github.com/pingcap/tidb/util/codec"
+	"github.com/stretchr/testify/require"
 )
 
-type testMetaKVSuite struct{}
-
-var _ = Suite(&testMetaKVSuite{})
-
 func encodeTxnMetaKey(key []byte, field []byte, ts uint64) []byte {
 	k := tablecodec.EncodeMetaKey(key, field)
 	txnKey := codec.EncodeBytes(nil, k)
 	return codec.EncodeUintDesc(txnKey, ts)
 }
 
-func (s *testMetaKVSuite) TestRawMetaKeyForDB(c *C) {
+func TestRawMetaKeyForDB(t *testing.T) {
 	var (
 		dbID int64  = 1
 		ts   uint64 = 400036290571534337
@@ -30,18 +27,18 @@ func (s *testMetaKVSuite) TestRawMetaKeyForDB(c *C) {
 
 	txnKey := encodeTxnMetaKey(mDbs, meta.DBkey(dbID), ts)
 
-	rawMetakey, err := ParseTxnMetaKeyFrom(txnKey)
-	c.Assert(err, IsNil)
+	rawMetaKey, err := ParseTxnMetaKeyFrom(txnKey)
+	require.NoError(t, err)
 
-	parseDbID, err := meta.ParseDBKey(rawMetakey.Field)
-	c.Assert(err, IsNil)
-	c.Assert(parseDbID, Equals, dbID)
+	parseDbID, err := meta.ParseDBKey(rawMetaKey.Field)
+	require.NoError(t, err)
+	require.Equal(t, dbID, parseDbID)
 
-	newKey := rawMetakey.EncodeMetaKey()
-	c.Assert(bytes.Equal(txnKey, newKey), IsTrue)
+	newKey := rawMetaKey.EncodeMetaKey()
+	require.Equal(t, string(txnKey), string(newKey))
 }
 
-func (s *testMetaKVSuite) TestRawMetaKeyForTable(c *C) {
+func TestRawMetaKeyForTable(t *testing.T) {
 	var (
 		dbID    int64  = 1
 		tableID int64  = 57
@@ -50,42 +47,41 @@ func (s *testMetaKVSuite) TestRawMetaKeyForTable(c *C) {
 	txnKey := encodeTxnMetaKey(meta.DBkey(dbID), meta.TableKey(tableID), ts)
 
 	rawMetakey, err := ParseTxnMetaKeyFrom(txnKey)
-	c.Assert(err, IsNil)
+	require.NoError(t, err)
 
 	parseDBID, err := meta.ParseDBKey(rawMetakey.Key)
-	c.Assert(err, IsNil)
-	c.Assert(parseDBID, Equals, dbID)
+	require.NoError(t, err)
+	require.Equal(t, dbID, parseDBID)
 
 	parseTableID, err := meta.ParseTableKey(rawMetakey.Field)
-	c.Assert(err, IsNil)
-	c.Assert(parseTableID, Equals, tableID)
+	require.NoError(t, err)
+	require.Equal(t, tableID, parseTableID)
 
 	newKey := rawMetakey.EncodeMetaKey()
-	c.Assert(bytes.Equal(txnKey, newKey), IsTrue)
+	require.True(t, bytes.Equal(txnKey, newKey))
 }
 
-func (s *testMetaKVSuite) TestWriteType(c *C) {
-	t := 'P'
-	wt, err := WriteTypeFrom(byte(t))
-	c.Assert(err, IsNil)
-	c.Assert(wt, Equals, WriteTypePut)
+func TestWriteType(t *testing.T) {
+	wt, err := WriteTypeFrom(byte('P'))
+	require.NoError(t, err)
+	require.Equal(t, WriteTypePut, wt)
 }
 
-func (s *testMetaKVSuite) TestWriteCFValueNoShortValue(c *C) {
+func TestWriteCFValueNoShortValue(t *testing.T) {
 	buff := make([]byte, 0, 9)
 	buff = append(buff, byte('P'))
 	buff = codec.EncodeUvarint(buff, 400036290571534337)
 
 	v := new(RawWriteCFValue)
 	err := v.ParseFrom(buff)
-	c.Assert(err, IsNil)
-	c.Assert(v.HasShortValue(), IsFalse)
+	require.NoError(t, err)
+	require.False(t, v.HasShortValue())
 
 	encodedBuff := v.EncodeTo()
-	c.Assert(bytes.Equal(buff, encodedBuff), IsTrue)
+	require.True(t, bytes.Equal(buff, encodedBuff))
 }
 
-func (s *testMetaKVSuite) TestWriteCFValueWithShortValue(c *C) {
+func TestWriteCFValueWithShortValue(t *testing.T) {
 	var ts uint64 = 400036290571534337
 	shortValue := []byte("pingCAP")
 
@@ -98,12 +94,12 @@ func (s *testMetaKVSuite) TestWriteCFValueWithShortValue(c *C) {
 
 	v := new(RawWriteCFValue)
 	err := v.ParseFrom(buff)
-	c.Assert(err, IsNil)
-	c.Assert(v.HasShortValue(), IsTrue)
-	c.Assert(bytes.Equal(v.GetShortValue(), shortValue), IsTrue)
-	c.Assert(v.hasGCFence, IsFalse)
-	c.Assert(v.hasOverlappedRollback, IsFalse)
+	require.NoError(t, err)
+	require.True(t, v.HasShortValue())
+	require.True(t, bytes.Equal(v.GetShortValue(), shortValue))
+	require.False(t, v.hasGCFence)
+	require.False(t, v.hasOverlappedRollback)
 
 	data := v.EncodeTo()
-	c.Assert(bytes.Equal(data, buff), IsTrue)
+	require.True(t, bytes.Equal(data, buff))
 }

br/pkg/stream/rewrite_meta_rawkv_test.go

@@ -4,18 +4,15 @@ package stream_test
 
 import (
 	"encoding/json"
+	"testing"
 
-	. "github.com/pingcap/check"
 	"github.com/pingcap/log"
 	"github.com/pingcap/tidb/br/pkg/logutil"
 	"github.com/pingcap/tidb/parser/model"
+	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 )
 
-type testRewriteMetaRawKvSuite struct{}
-
-var _ = Suite(&testRewriteMetaRawKvSuite{})
-
 func ProduceValue(tableName string, dbID int64) ([]byte, error) {
 	tableInfo := model.TableInfo{
 		ID:   dbID,
@@ -25,18 +22,18 @@ func ProduceValue(tableName string, dbID int64) ([]byte, error) {
 	return json.Marshal(tableInfo)
 }
 
-func (s *testRewriteMetaRawKvSuite) TestRewriteValueForTable(c *C) {
+func TestRewriteValueForTable(t *testing.T) {
 	var (
 		tableName  = "person"
 		tableID    = 57
 		newTableID = 63
 	)
 
 	v, err := ProduceValue(tableName, int64(tableID))
-	c.Assert(err, Equals, nil)
+	require.NoError(t, err)
 	log.Info("old-value", zap.Int("value-len", len(v)), zap.ByteString("old-value", v), logutil.Key("old-value", v))
 
 	v, err = ProduceValue(tableName, int64(newTableID))
-	c.Assert(err, Equals, nil)
+	require.NoError(t, err)
 	log.Info("new-value", zap.Int("value-len", len(v)), zap.ByteString("new-value", v), logutil.Key("new-value", v))
 }

go.mod

@@ -44,7 +44,6 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/pingcap/badger v1.5.1-0.20220314162537-ab58fbf40580
-	github.com/pingcap/check v0.0.0-20211026125417-57bd13f7b5f0
 	github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c
 	github.com/pingcap/failpoint v0.0.0-20220423142525-ae43b7f4e5c3
 	github.com/pingcap/fn v0.0.0-20200306044125-d5540d389059

session/main_test.go

@@ -21,7 +21,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/check"
 	"github.com/pingcap/tidb/config"
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/kv"
@@ -39,6 +38,9 @@ import (
 
 var testDataMap = make(testdata.BookKeeper, 1)
 
+var _ = flag.Bool("with-tikv", false, "workaroundGoCheckFlags: with-tikv")
+var _ = flag.String("pd-addrs", "", "workaroundGoCheckFlags: pd-addrs")
+
 func TestMain(m *testing.M) {
 	testmain.ShortCircuitForBench(m)
 
@@ -76,10 +78,6 @@ func TestMain(m *testing.M) {
 	goleak.VerifyTestMain(testmain.WrapTestingM(m, callback), opts...)
 }
 
-func TestT(t *testing.T) {
-	check.TestingT(t)
-}
-
 func GetClusteredIndexSuiteData() testdata.TestData {
 	return testDataMap["clustered_index_suite"]
 }