fix test

Author: wxiaoguang

models/auth/source_test.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"xorm.io/xorm"
 	"xorm.io/xorm/schemas"
 )
 
@@ -59,7 +58,7 @@ func TestDumpAuthSource(t *testing.T) {
 	sb := new(strings.Builder)
 
 	// TODO: this test is quite hacky, it should use a low-level "select" (without model processors) but not a database dump
-	engine := db.GetEngine(t.Context()).(*xorm.Engine)
+	engine := unittest.GetXORMEngine()
 	require.NoError(t, engine.DumpTables([]*schemas.Table{authSourceSchema}, sb))
 	assert.Contains(t, sb.String(), `"Provider":"ConvertibleSourceName"`)
 }

models/db/context.go

@@ -90,7 +90,8 @@ func contextSafetyCheck(e Engine) {
 }
 
 // GetEngine gets an existing db Engine/Statement or creates a new Session
-func GetEngine(ctx context.Context) Engine {
+func GetEngine(ctx context.Context) (e Engine) {
+	defer func() { contextSafetyCheck(e) }()
 	if e := getExistingEngine(ctx); e != nil {
 		return e
 	}
@@ -99,7 +100,6 @@ func GetEngine(ctx context.Context) Engine {
 
 // getExistingEngine gets an existing db Engine/Statement from this context or returns nil
 func getExistingEngine(ctx context.Context) (e Engine) {
-	defer func() { contextSafetyCheck(e) }()
 	if engined, ok := ctx.(*Context); ok {
 		return engined.engine
 	}

tests/integration/db_collation_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models/db"
+	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/test"
 
 	"github.com/stretchr/testify/assert"
-	"xorm.io/xorm"
 )
 
 type TestCollationTbl struct {
@@ -20,7 +20,7 @@ type TestCollationTbl struct {
 }
 
 func TestDatabaseCollation(t *testing.T) {
-	x := db.GetEngine(t.Context()).(*xorm.Engine)
+	x := unittest.GetXORMEngine()
 
 	// all created tables should use case-sensitive collation by default
 	_, _ = x.Exec("DROP TABLE IF EXISTS test_collation_tbl")