fix

wxiaoguang · wxiaoguang · commit d97a960c51f4 · 2021-11-12T19:18:47.000+08:00
diff --git a/models/db/paginator/main_test.go b/models/db/paginator/main_test.go
@@ -12,5 +12,5 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	unittest.MainTest(m, filepath.Join("..", ".."))
+	unittest.MainTest(m, filepath.Join("..", "..", ".."))
 }
diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go
@@ -19,12 +19,11 @@ import (
 
 var fixtures *testfixtures.Loader
 
-func getXORMEngine(engine ...*xorm.Engine) *xorm.Engine {
-	e := db.DefaultContext.(*db.Context).Engine().(*xorm.Engine)
+func getXORMEngine(engine ...*xorm.Engine) (x *xorm.Engine) {
 	if len(engine) == 1 {
-		e = engine[0]
+		return engine[0]
 	}
-	return e
+	return db.DefaultContext.(*db.Context).Engine().(*xorm.Engine)
 }
 
 // InitFixtures initialize test fixtures for a test database

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func TestMain(m *testing.M) {`
`15`		`- unittest.MainTest(m, filepath.Join("..", ".."))`
	`15`	`+ unittest.MainTest(m, filepath.Join("..", "..", ".."))`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,11 @@ import (`
`19`	`19`
`20`	`20`	`var fixtures *testfixtures.Loader`
`21`	`21`
`22`		`-func getXORMEngine(engine ...xorm.Engine) xorm.Engine {`
`23`		`- e := db.DefaultContext.(db.Context).Engine().(xorm.Engine)`
	`22`	`+func getXORMEngine(engine ...xorm.Engine) (x xorm.Engine) {`
`24`	`23`	`if len(engine) == 1 {`
`25`		`- e = engine[0]`
	`24`	`+ return engine[0]`
`26`	`25`	`}`
`27`		`- return e`
	`26`	`+ return db.DefaultContext.(db.Context).Engine().(xorm.Engine)`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`// InitFixtures initialize test fixtures for a test database`