Browse Source

Don't keep running SetEngine in migration_test (#12860)

There's no need to keep repeatedly running SetEngine in migration_test,
as NewEngine calls it anyway.

Signed-off-by: Andrew Thornton <art27@cantab.net>
tags/v1.13.0-rc1
zeripath GitHub 5 years ago
parent
commit
e12a69ca57
1 changed files with 1 additions and 9 deletions
  1. +1
    -9
      integrations/migration-test/migration_test.go

+ 1
- 9
integrations/migration-test/migration_test.go View File

@@ -252,16 +252,11 @@ func doMigrationTest(t *testing.T, version string) {
}

setting.NewXORMLogService(false)
err := models.SetEngine()
assert.NoError(t, err)

err = models.NewEngine(context.Background(), wrappedMigrate)
err := models.NewEngine(context.Background(), wrappedMigrate)
assert.NoError(t, err)
currentEngine.Close()

err = models.SetEngine()
assert.NoError(t, err)

beans, _ := models.NamesToBean()

err = models.NewEngine(context.Background(), func(x *xorm.Engine) error {
@@ -272,9 +267,6 @@ func doMigrationTest(t *testing.T, version string) {
currentEngine.Close()

// We do this a second time to ensure that there is not a problem with retained indices
err = models.SetEngine()
assert.NoError(t, err)

err = models.NewEngine(context.Background(), func(x *xorm.Engine) error {
currentEngine = x
return migrations.RecreateTables(beans...)(x)


Loading…
Cancel
Save