Skip to content

Commit 2aea854

Browse files
Bartłomiej Święckijeroiraz
authored andcommitted
test(pkg/integration/replication): Make tests independent
Instead of creating a single cluster shared across the test suite, create independent cluster for each suite. Signed-off-by: Bartłomiej Święcki <[email protected]>
1 parent 6d1d939 commit 2aea854

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

pkg/integration/replication/suite.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ func (suite *baseReplicationTestSuite) SetupCluster(syncReplicas, syncAcks, asyn
307307
wg.Wait()
308308
}
309309

310-
// SetupSuite initializes the suite
311-
func (suite *baseReplicationTestSuite) SetupSuite() {
310+
// SetupTest initializes the suite
311+
func (suite *baseReplicationTestSuite) SetupTest() {
312312
suite.mu.Lock()
313313
defer suite.mu.Unlock()
314314

@@ -318,7 +318,7 @@ func (suite *baseReplicationTestSuite) SetupSuite() {
318318
}
319319

320320
// this function executes after all tests executed
321-
func (suite *baseReplicationTestSuite) TearDownSuite() {
321+
func (suite *baseReplicationTestSuite) TearDownTest() {
322322
suite.mu.Lock()
323323
defer suite.mu.Unlock()
324324

@@ -328,10 +328,12 @@ func (suite *baseReplicationTestSuite) TearDownSuite() {
328328
srv.Shutdown(suite.T())
329329
}
330330
}
331+
suite.followers = []TestServer{}
331332

332333
// stop master
333334
if suite.master != nil {
334335
suite.master.Shutdown(suite.T())
335336
suite.master = nil
336337
}
338+
suite.master = nil
337339
}

pkg/integration/replication/synchronous_replication_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ func TestSyncTestSuite(t *testing.T) {
2222
}
2323

2424
// this function executes before the test suite begins execution
25-
func (suite *SyncTestSuite) SetupSuite() {
26-
suite.baseReplicationTestSuite.SetupSuite()
25+
func (suite *SyncTestSuite) SetupTest() {
26+
suite.baseReplicationTestSuite.SetupTest()
2727
suite.SetupCluster(2, 2, 0)
2828
}
2929

@@ -166,8 +166,8 @@ func TestSyncTestMinimumFollowersSuite(t *testing.T) {
166166
}
167167

168168
// this function executes before the test suite begins execution
169-
func (suite *SyncTestMinimumFollowersSuite) SetupSuite() {
170-
suite.baseReplicationTestSuite.SetupSuite()
169+
func (suite *SyncTestMinimumFollowersSuite) SetupTest() {
170+
suite.baseReplicationTestSuite.SetupTest()
171171
suite.SetupCluster(4, 2, 0)
172172
}
173173

@@ -263,8 +263,8 @@ func TestSyncTestRecoverySpeedSuite(t *testing.T) {
263263
suite.Run(t, &SyncTestRecoverySpeedSuite{})
264264
}
265265

266-
func (suite *SyncTestRecoverySpeedSuite) SetupSuite() {
267-
suite.baseReplicationTestSuite.SetupSuite()
266+
func (suite *SyncTestRecoverySpeedSuite) SetupTest() {
267+
suite.baseReplicationTestSuite.SetupTest()
268268
suite.SetupCluster(2, 1, 0)
269269
}
270270

@@ -394,8 +394,8 @@ func TestSyncTestWithAsyncFollowersSuite(t *testing.T) {
394394
suite.Run(t, &SyncTestWithAsyncFollowersSuite{})
395395
}
396396

397-
func (suite *SyncTestWithAsyncFollowersSuite) SetupSuite() {
398-
suite.baseReplicationTestSuite.SetupSuite()
397+
func (suite *SyncTestWithAsyncFollowersSuite) SetupTest() {
398+
suite.baseReplicationTestSuite.SetupTest()
399399
suite.SetupCluster(2, 1, 1)
400400
}
401401

@@ -483,8 +483,8 @@ func TestSyncTestChangingMasterSuite(t *testing.T) {
483483
suite.Run(t, &SyncTestChangingMasterSuite{})
484484
}
485485

486-
func (suite *SyncTestChangingMasterSuite) SetupSuite() {
487-
suite.baseReplicationTestSuite.SetupSuite()
486+
func (suite *SyncTestChangingMasterSuite) SetupTest() {
487+
suite.baseReplicationTestSuite.SetupTest()
488488
suite.SetupCluster(2, 1, 0)
489489
}
490490

0 commit comments

Comments
 (0)