- refactor test init flow

globals/globals.go

@@ -43,13 +43,10 @@ func init() {
 	logger, _ := zap.NewDevelopment()
 	SugarLogger = logger.Sugar()
 	baseapi.Init(SugarLogger)
-
-	// todo 这里只是临时把这个放这里，不然在其它引用globals的地方会导致得不到正确的值
-	// 但放这里又会导致单元测试的配置不正确，找不到配置文件
-	Init()
 }
 
 func Init() {
+	SugarLogger.Infof("globals RunMode=%s", beego.BConfig.RunMode)
 	ReallyCallPlatformAPI = (beego.BConfig.RunMode != "dev" && beego.BConfig.RunMode != "test")
 	ReallySendWeixinMsg = ReallyCallPlatformAPI && beego.BConfig.RunMode == "prod"
 	ReallyReplyComment = ReallyCallPlatformAPI && beego.BConfig.RunMode == "prod"

globals/testinit/testinit.go

@@ -0,0 +1,11 @@
+package testinit
+
+import (
+	"git.rosy.net.cn/jx-callback/globals/api"
+	"git.rosy.net.cn/jx-callback/globals/testinit1"
+)
+
+func Init() {
+	testinit1.Init()
+	api.Init()
+}

globals/testinit1/testinit1.go

@@ -0,0 +1,22 @@
+package testinit1
+
+import (
+	"path/filepath"
+	"runtime"
+
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/beegodb"
+	"github.com/astaxie/beego"
+)
+
+func Init() {
+	_, file, _, _ := runtime.Caller(0)
+	apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".."+string(filepath.Separator)+".."+string(filepath.Separator))))
+	beego.TestBeegoInit(apppath)
+
+	globals.SugarLogger.Infof("testinit RunMode=%s", beego.BConfig.RunMode)
+	beego.BConfig.RunMode = "dev" // InitBeegoBeforeTest会将runmode设置为test
+
+	globals.Init()
+	beegodb.Init()
+}