database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ddl: update test.

Browse Source
This commit is contained in:
qiuyesuifeng
2015-11-09 15:26:28 +08:00
parent dbd4ba0aed
commit 33cbce9cd1
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ddl/column_test.go
View File

@ -495,9 +495,7 @@ func (s *testIndexSuite) TestAddColumn(c *C) {
done <- testCreateColumn(c, ctx, s.d, s.dbInfo, tblInfo, colName, &ColumnPosition{Type: ColumnPositionNone}, defaultColValue)
}()
states := []model.SchemaState{model.StateDeleteOnly, model.StateWriteOnly, model.StateReorganization, model.StatePublic}
stateIndex := 0
lastStateIndex := -1
lastCheckState := model.StateNone
col := &column.Col{}
for {
@ -516,19 +514,14 @@ func (s *testIndexSuite) TestAddColumn(c *C) {
}
// Here means column state is not changed, so just skipped.
if stateIndex == lastStateIndex {
if lastCheckState == col.State {
continue
}
if stateIndex == len(states) {
return
}
lastStateIndex = stateIndex
stateIndex++
s.checkAddOrDropColumn(c, col.State, ctx, d, tblInfo, handle, col, row, defaultColValue, false)
lastCheckState = col.State
d.start()
}
}
@ -566,9 +559,7 @@ func (s *testIndexSuite) TestDropColumn(c *C) {
done <- testDropColumn(c, ctx, s.d, s.dbInfo, tblInfo, colName, false)
}()
states := []model.SchemaState{model.StateWriteOnly, model.StateDeleteOnly, model.StateReorganization}
stateIndex := 0
lastStateIndex := -1
lastCheckState := model.StateNone
col := &column.Col{}
for {
@ -587,19 +578,14 @@ func (s *testIndexSuite) TestDropColumn(c *C) {
}
// Here means column state is not changed, so just skipped.
if stateIndex == lastStateIndex {
if lastCheckState == col.State {
continue
}
if stateIndex == len(states) {
return
}
lastStateIndex = stateIndex
stateIndex++
s.checkAddOrDropColumn(c, col.State, ctx, d, tblInfo, handle, col, row, defaultColValue, true)
lastCheckState = col.State
d.start()
}
}