Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddl/table_test.go: migrate infra to testify #29288

Closed
wants to merge 5 commits into from
Closed

ddl/table_test.go: migrate infra to testify #29288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f3adc3
Use testify for ddl/table_test.go
clovis1122 Nov 2, 2021
4503228
Fix loop in reorg
clovis1122 Nov 4, 2021
5d7a49f
Fix test in restart_test.go
clovis1122 Nov 4, 2021
0d3e9bf
Replace reflect.DeepEqual check with require.Equal
clovis1122 Nov 6, 2021
28ae481
Fix syntax error
clovis1122 Nov 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ddl/callback_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (tc *TestDDLCallback) OnWatched(ctx context.Context) {
tc.BaseCallback.OnWatched(ctx)
}

func (s *testDDLSuite) TestCallback(c *C) {
func (tc *TestDDLCallback) TestCallback(c *C) {
cb := &BaseCallback{}
c.Assert(cb.OnChanged(nil), IsNil)
cb.OnJobRunBefore(nil)
Expand Down
105 changes: 57 additions & 48 deletions ddl/column_change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"fmt"
"sync"
"sync/atomic"
"testing"
"time"

. "github.com/pingcap/check"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/meta"
Expand All @@ -36,62 +36,65 @@ import (
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/mock"
"github.com/pingcap/tidb/util/testutil"
"github.com/stretchr/testify/require"
)

var _ = Suite(&testColumnChangeSuite{})

type testColumnChangeSuite struct {
type columnChangeSuite struct {
store kv.Storage
dbInfo *model.DBInfo
}

func (s *testColumnChangeSuite) SetUpSuite(c *C) {
func createColumnChangeSuite(t *testing.T) (s *columnChangeSuite, clean func()) {
s = new(columnChangeSuite)
SetWaitTimeWhenErrorOccurred(1 * time.Microsecond)
s.store = testCreateStore(c, "test_column_change")
s.store = testCreateStore(t, "test_column_change")
d := testNewDDLAndStart(
context.Background(),
c,
t,
WithStore(s.store),
WithLease(testLease),
)
defer func() {
err := d.Stop()
c.Assert(err, IsNil)
require.NoError(t, err)
}()
s.dbInfo = testSchemaInfo(c, d, "test_index_change")
testCreateSchema(c, testNewContext(d), d, s.dbInfo)
}
s.dbInfo = testSchemaInfo(t, d, "test_index_change")
testCreateSchema(t, testNewContext(d), d, s.dbInfo)

func (s *testColumnChangeSuite) TearDownSuite(c *C) {
s.store.Close()
clean = func() {
s.store.Close()
}
return
}

func (s *testColumnChangeSuite) TestColumnChange(c *C) {
func TestColumnChange(t *testing.T) {
s, clean := createColumnChangeSuite(t)
defer clean()
d := testNewDDLAndStart(
context.Background(),
c,
t,
WithStore(s.store),
WithLease(testLease),
)
defer func() {
err := d.Stop()
c.Assert(err, IsNil)
require.NoError(t, err)
}()
// create table t (c1 int, c2 int);
tblInfo := testTableInfo(c, d, "t", 2)
tblInfo := testTableInfo(t, d, "t", 2)
ctx := testNewContext(d)
err := ctx.NewTxn(context.Background())
c.Assert(err, IsNil)
testCreateTable(c, ctx, d, s.dbInfo, tblInfo)
require.NoError(t, err)
testCreateTable(t, ctx, d, s.dbInfo, tblInfo)
// insert t values (1, 2);
originTable := testGetTable(c, d, s.dbInfo.ID, tblInfo.ID)
originTable := testGetTable(t, d, s.dbInfo.ID, tblInfo.ID)
row := types.MakeDatums(1, 2)
h, err := originTable.AddRecord(ctx, row)
c.Assert(err, IsNil)
require.NoError(t, err)
txn, err := ctx.Txn(true)
c.Assert(err, IsNil)
require.NoError(t, err)
err = txn.Commit(context.Background())
c.Assert(err, IsNil)
require.NoError(t, err)

var mu sync.Mutex
tc := &TestDDLCallback{}
Expand Down Expand Up @@ -152,31 +155,33 @@ func (s *testColumnChangeSuite) TestColumnChange(c *C) {
}
d.SetHook(tc)
defaultValue := int64(3)
job := testCreateColumn(c, ctx, d, s.dbInfo, tblInfo, "c3", &ast.ColumnPosition{Tp: ast.ColumnPositionNone}, defaultValue)
c.Assert(checkErr, IsNil)
testCheckJobDone(c, d, job, true)
job := testCreateColumn(t, ctx, d, s.dbInfo, tblInfo, "c3", &ast.ColumnPosition{Tp: ast.ColumnPositionNone}, defaultValue)
require.NoError(t, checkErr)
testCheckJobDone(t, d, job, true)
mu.Lock()
tb := publicTable
mu.Unlock()
s.testColumnDrop(c, ctx, d, tb)
s.testAddColumnNoDefault(c, ctx, d, tblInfo)
s.testColumnDrop(t, ctx, d, tb)
s.testAddColumnNoDefault(t, ctx, d, tblInfo)
}

func (s *testColumnChangeSuite) TestModifyAutoRandColumnWithMetaKeyChanged(c *C) {
func TestModifyAutoRandColumnWithMetaKeyChanged(t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For example, this file is not under ddl/table. If reviewers found a 1000 lines diff including non trivial change, most of them will simply give up to review.

Take a look at #26022 and see that we either run parallel tests, or serial test in xxx_serial_test.go.

s, clean := createColumnChangeSuite(t)
defer clean()
d := testNewDDLAndStart(
context.Background(),
c,
t,
WithStore(s.store),
WithLease(testLease),
)
defer func() {
err := d.Stop()
c.Assert(err, IsNil)
require.NoError(t, err)
}()

ids, err := d.genGlobalIDs(1)
tableID := ids[0]
c.Assert(err, IsNil)
require.NoError(t, err)
colInfo := &model.ColumnInfo{
Name: model.NewCIStr("a"),
Offset: 0,
Expand All @@ -191,7 +196,7 @@ func (s *testColumnChangeSuite) TestModifyAutoRandColumnWithMetaKeyChanged(c *C)
}
colInfo.ID = allocateColumnID(tblInfo)
ctx := testNewContext(d)
testCreateTable(c, ctx, d, s.dbInfo, tblInfo)
testCreateTable(t, ctx, d, s.dbInfo, tblInfo)

tc := &TestDDLCallback{}
var errCount int32 = 3
Expand All @@ -217,10 +222,10 @@ func (s *testColumnChangeSuite) TestModifyAutoRandColumnWithMetaKeyChanged(c *C)
Args: []interface{}{colInfo, colInfo.Name, ast.ColumnPosition{}, 0, newAutoRandomBits},
}
err = d.doDDLJob(ctx, job)
c.Assert(err, IsNil)
c.Assert(errCount == 0, IsTrue)
c.Assert(genAutoRandErr, IsNil)
testCheckJobDone(c, d, job, true)
require.NoError(t, err)
require.True(t, errCount == 0)
require.NoError(t, genAutoRandErr)
testCheckJobDone(t, d, job, true)
var newTbInfo *model.TableInfo
err = kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
Expand All @@ -231,11 +236,13 @@ func (s *testColumnChangeSuite) TestModifyAutoRandColumnWithMetaKeyChanged(c *C)
}
return nil
})
c.Assert(err, IsNil)
c.Assert(newTbInfo.AutoRandomBits, Equals, newAutoRandomBits)
require.NoError(t, err)
require.Equal(t, newTbInfo.AutoRandomBits, newAutoRandomBits)
}

func (s *testColumnChangeSuite) testAddColumnNoDefault(c *C, ctx sessionctx.Context, d *ddl, tblInfo *model.TableInfo) {
func (s *columnChangeSuite) testAddColumnNoDefault(t *testing.T, ctx sessionctx.Context, d *ddl, tblInfo *model.TableInfo) {
s, clean := createColumnChangeSuite(t)
defer clean()
tc := &TestDDLCallback{}
// set up hook
prevState := model.StateNone
Expand Down Expand Up @@ -278,12 +285,14 @@ func (s *testColumnChangeSuite) testAddColumnNoDefault(c *C, ctx sessionctx.Cont
}
}
d.SetHook(tc)
job := testCreateColumn(c, ctx, d, s.dbInfo, tblInfo, "c3", &ast.ColumnPosition{Tp: ast.ColumnPositionNone}, nil)
c.Assert(checkErr, IsNil)
testCheckJobDone(c, d, job, true)
job := testCreateColumn(t, ctx, d, s.dbInfo, tblInfo, "c3", &ast.ColumnPosition{Tp: ast.ColumnPositionNone}, nil)
require.NoError(t, checkErr)
testCheckJobDone(t, d, job, true)
}

func (s *testColumnChangeSuite) testColumnDrop(c *C, ctx sessionctx.Context, d *ddl, tbl table.Table) {
func (s *columnChangeSuite) testColumnDrop(t *testing.T, ctx sessionctx.Context, d *ddl, tbl table.Table) {
s, clean := createColumnChangeSuite(t)
defer clean()
dropCol := tbl.Cols()[2]
tc := &TestDDLCallback{}
// set up hook
Expand All @@ -305,8 +314,8 @@ func (s *testColumnChangeSuite) testColumnDrop(c *C, ctx sessionctx.Context, d *
}
}
d.SetHook(tc)
c.Assert(checkErr, IsNil)
testDropColumn(c, ctx, d, s.dbInfo, tbl.Meta(), dropCol.Name.L, false)
require.NoError(t, checkErr)
testDropColumn(t, ctx, d, s.dbInfo, tbl.Meta(), dropCol.Name.L, false)
}

func seek(t table.PhysicalTable, ctx sessionctx.Context, h kv.Handle) (kv.Handle, bool, error) {
Expand All @@ -331,7 +340,7 @@ func seek(t table.PhysicalTable, ctx sessionctx.Context, h kv.Handle) (kv.Handle
return handle, true, nil
}

func (s *testColumnChangeSuite) checkAddWriteOnly(ctx sessionctx.Context, d *ddl, deleteOnlyTable, writeOnlyTable table.Table, h kv.Handle) error {
func (s *columnChangeSuite) checkAddWriteOnly(ctx sessionctx.Context, d *ddl, deleteOnlyTable, writeOnlyTable table.Table, h kv.Handle) error {
// WriteOnlyTable: insert t values (2, 3)
err := ctx.NewTxn(context.Background())
if err != nil {
Expand Down Expand Up @@ -405,7 +414,7 @@ func touchedSlice(t table.Table) []bool {
return touched
}

func (s *testColumnChangeSuite) checkAddPublic(sctx sessionctx.Context, d *ddl, writeOnlyTable, publicTable table.Table) error {
func (s *columnChangeSuite) checkAddPublic(sctx sessionctx.Context, d *ddl, writeOnlyTable, publicTable table.Table) error {
ctx := context.TODO()
// publicTable Insert t values (4, 4, 4)
err := sctx.NewTxn(ctx)
Expand Down
Loading