Skip to content

Commit ddbcc04

Browse files
committed
f
1 parent f397ed4 commit ddbcc04

2 files changed

Lines changed: 6 additions & 10 deletions

File tree

integration_test/tidb_tidb_test.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/moiot/gravity/pkg/consts"
10-
119
"github.com/moiot/gravity/pkg/inputs"
1210
"github.com/moiot/gravity/pkg/outputs/mysql"
1311
"github.com/moiot/gravity/pkg/sql_execution_engine"
@@ -41,8 +39,7 @@ func TestBidirection(t *testing.T) {
4139
r.NoError(err)
4240
defer sourceDB.Close()
4341

44-
_, err = sourceDB.Exec("drop database if exists " + consts.GravityDBName)
45-
r.NoError(err)
42+
r.NoError(mysql_test.SetupTestDB(sourceDB, sourceDBName))
4643

4744
err = utils.InitInternalTxnTags(sourceDB)
4845
r.NoError(err)
@@ -51,6 +48,8 @@ func TestBidirection(t *testing.T) {
5148
r.NoError(err)
5249
defer targetDB.Close()
5350

51+
r.NoError(mysql_test.SetupTestDB(targetDB, targetDBName))
52+
5453
pipelineConfig := config.PipelineConfigV3{
5554
PipelineName: t.Name(),
5655
Version: config.PipelineConfigV3Version,
@@ -103,9 +102,6 @@ func TestBidirection(t *testing.T) {
103102

104103
r.NoError(server.Start())
105104

106-
_, err = sourceDB.Exec(fmt.Sprintf("create database `%s`", sourceDBName))
107-
r.NoError(err)
108-
109105
_, err = sourceDB.Exec(fmt.Sprintf("create table `%s`.t(id int(11), primary key(id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ", sourceDBName))
110106
r.NoError(err)
111107

pkg/mysql_test/test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ func SeedCompositePrimaryKeyInt(db *sql.DB, dbName string) {
432432

433433
}
434434

435-
func setupTestDB(db *sql.DB, dbName string) error {
435+
func SetupTestDB(db *sql.DB, dbName string) error {
436436

437437
// setup test tableNames
438438
if _, err := db.Exec(dropDBStatement(dbName)); err != nil {
@@ -502,7 +502,7 @@ func MustCreateSourceDBConn() *sql.DB {
502502
// MustSetupSourceDB setup a test db, so that we can use different db in different test cases
503503
func MustSetupSourceDB(dbName string) *sql.DB {
504504
db := MustCreateSourceDBConn()
505-
err := setupTestDB(db, dbName)
505+
err := SetupTestDB(db, dbName)
506506
if err != nil {
507507
log.Fatalf("failed to setup source db err: %v", errors.ErrorStack(err))
508508
}
@@ -538,7 +538,7 @@ func MustCreateTargetDBConn() *sql.DB {
538538
func MustSetupTargetDB(dbName string) *sql.DB {
539539
db := MustCreateTargetDBConn()
540540

541-
err := setupTestDB(db, dbName)
541+
err := SetupTestDB(db, dbName)
542542
if err != nil {
543543
log.Fatalf("failed to setup source db1 err: %v", errors.ErrorStack(err))
544544
}

0 commit comments

Comments
 (0)