@@ -35,13 +35,24 @@ import (
3535 "github.com/stretchr/testify/require"
3636)
3737
38+ // TODO (xiang): Fix and unskip those flaky backup tests.
39+ func skipFlakyBackupTests (t * testing.T , path string ) {
40+ if strings .Contains (path , "alter_table_multiple_commands" ) ||
41+ strings .Contains (path , "alter_table_alter_primary_key_drop_rowid" ) ||
42+ strings .Contains (path , "drop_column_basic" ) {
43+ skip .WithIssue (t , 108221 , "skipping flaky tests" )
44+ }
45+ }
46+
3847// BackupSuccess tests that the schema changer can handle being backed up
3948// any time during a successful schema change.
4049func BackupSuccess (t * testing.T , path string , factory TestServerFactory ) {
4150 // These tests are expensive.
4251 skip .UnderStress (t )
4352 skip .UnderRace (t )
4453
54+ skipFlakyBackupTests (t , path )
55+
4556 cumulativeTestForEachPostCommitStage (t , path , factory , func (t * testing.T , cs CumulativeTestCaseSpec ) {
4657 backupSuccess (t , factory , cs )
4758 })
@@ -57,6 +68,8 @@ func BackupRollbacks(t *testing.T, path string, factory TestServerFactory) {
5768 // and at least as expensive to run.
5869 skip .UnderShort (t )
5970
71+ skipFlakyBackupTests (t , path )
72+
6073 cumulativeTestForEachPostCommitStage (t , path , factory , func (t * testing.T , cs CumulativeTestCaseSpec ) {
6174 backupRollbacks (t , factory , cs )
6275 })
@@ -72,6 +85,8 @@ func BackupSuccessMixedVersion(t *testing.T, path string, factory TestServerFact
7285 // and at least as expensive to run.
7386 skip .UnderShort (t )
7487
88+ skipFlakyBackupTests (t , path )
89+
7590 factory = factory .WithMixedVersion ()
7691 cumulativeTestForEachPostCommitStage (t , path , factory , func (t * testing.T , cs CumulativeTestCaseSpec ) {
7792 backupSuccess (t , factory , cs )
@@ -88,6 +103,8 @@ func BackupRollbacksMixedVersion(t *testing.T, path string, factory TestServerFa
88103 // and at least as expensive to run.
89104 skip .UnderShort (t )
90105
106+ skipFlakyBackupTests (t , path )
107+
91108 factory = factory .WithMixedVersion ()
92109 cumulativeTestForEachPostCommitStage (t , path , factory , func (t * testing.T , cs CumulativeTestCaseSpec ) {
93110 backupRollbacks (t , factory , cs )
0 commit comments