github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-04-23 03:00:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into maskpp/resender_2

Browse Source
This commit is contained in:
HAOYUatHZ
2023-03-10 10:11:51 +08:00
parent 50fb641b9c d3c84dd013
commit 610f952f40
16 changed files with 357 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
database/cmd/app/app_test.go
View File

@@ -10,10 +10,10 @@ import (
)
func TestRunDatabase(t *testing.T) {
bridge := cmd.NewCmd(t, "db_cli-test", "--version")
defer bridge.WaitExit()
dbcli := cmd.NewCmd(t, "db_cli-test", "--version")
defer dbcli.WaitExit()
// wait result
bridge.ExpectWithTimeout(true, time.Second*3, fmt.Sprintf("db_cli version %s", version.Version))
bridge.RunApp(nil)
dbcli.ExpectWithTimeout(true, time.Second*3, fmt.Sprintf("db_cli version %s", version.Version))
dbcli.RunApp(nil)
}

13
database/migrate/migrate_test.go
View File

@@ -13,18 +13,18 @@ import (
)
var (
pgDB *sqlx.DB
dbImg docker.ImgInstance
base *docker.App
pgDB *sqlx.DB
)
func initEnv(t *testing.T) error {
// Start db container.
dbImg = docker.NewTestDBDocker(t, "postgres")
base.RunImages(t)
// Create db orm handler.
factory, err := database.NewOrmFactory(&database.DBConfig{
DriverName: "postgres",
DSN: dbImg.Endpoint(),
DSN: base.DBEndpoint(),
})
if err != nil {
return err
@@ -34,6 +34,7 @@ func initEnv(t *testing.T) error {
}
func TestMigrate(t *testing.T) {
base = docker.NewDockerApp()
if err := initEnv(t); err != nil {
t.Fatal(err)
}
@@ -45,9 +46,7 @@ func TestMigrate(t *testing.T) {
t.Run("testRollback", testRollback)
t.Cleanup(func() {
if dbImg != nil {
assert.NoError(t, dbImg.Stop())
}
base.Free()
})
}

11
database/orm_test.go
View File

@@ -77,7 +77,7 @@ var (
batchData2 *types.BatchData
dbConfig *database.DBConfig
dbImg docker.ImgInstance
base *docker.App
ormBlock orm.BlockTraceOrm
ormLayer1 orm.L1MessageOrm
ormLayer2 orm.L2MessageOrm
@@ -88,8 +88,8 @@ var (
func setupEnv(t *testing.T) error {
// Init db config and start db container.
dbConfig = &database.DBConfig{DriverName: "postgres"}
dbImg = docker.NewTestDBDocker(t, dbConfig.DriverName)
dbConfig.DSN = dbImg.Endpoint()
base.RunImages(t)
dbConfig.DSN = base.DBEndpoint()
// Create db handler and reset db.
factory, err := database.NewOrmFactory(dbConfig)
@@ -156,10 +156,9 @@ func setupEnv(t *testing.T) error {
// TestOrmFactory run several test cases.
func TestOrmFactory(t *testing.T) {
base = docker.NewDockerApp()
defer func() {
if dbImg != nil {
assert.NoError(t, dbImg.Stop())
}
base.Free()
}()
if err := setupEnv(t); err != nil {
t.Fatal(err)