Skip to content

Commit 0d14c2f

Browse files
authored
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 <[email protected]>
1 parent 81ed47c commit 0d14c2f

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

integrations/migration-test/migration_test.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,11 @@ func doMigrationTest(t *testing.T, version string) {
252252
}
253253

254254
setting.NewXORMLogService(false)
255-
err := models.SetEngine()
256-
assert.NoError(t, err)
257255

258-
err = models.NewEngine(context.Background(), wrappedMigrate)
256+
err := models.NewEngine(context.Background(), wrappedMigrate)
259257
assert.NoError(t, err)
260258
currentEngine.Close()
261259

262-
err = models.SetEngine()
263-
assert.NoError(t, err)
264-
265260
beans, _ := models.NamesToBean()
266261

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

274269
// We do this a second time to ensure that there is not a problem with retained indices
275-
err = models.SetEngine()
276-
assert.NoError(t, err)
277-
278270
err = models.NewEngine(context.Background(), func(x *xorm.Engine) error {
279271
currentEngine = x
280272
return migrations.RecreateTables(beans...)(x)

0 commit comments

Comments
 (0)