From 675643c68d116cc9229c6bad76630426eaa6258b Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Tue, 10 Jun 2014 22:47:48 +0800
Subject: [PATCH] beego: run mode support test

---
 beego.go  | 1 +
 config.go | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/beego.go b/beego.go
index c9794bfa..74a06b95 100644
--- a/beego.go
+++ b/beego.go
@@ -384,6 +384,7 @@ func initBeforeHttpRun() {
 // this function is for test package init
 func TestBeegoInit(apppath string) {
 	AppPath = apppath
+	RunMode = "test"
 	AppConfigPath = filepath.Join(AppPath, "conf", "app.conf")
 	err := ParseConfig()
 	if err != nil && !os.IsNotExist(err) {
diff --git a/config.go b/config.go
index e8f752bd..47a6679c 100644
--- a/config.go
+++ b/config.go
@@ -178,7 +178,11 @@ func ParseConfig() (err error) {
 		AppConfig = config.NewFakeConfig()
 		return err
 	} else {
-		HttpAddr = AppConfig.String("HttpAddr")
+		if v := AppConfig.String(RunMode + "::HttpAddr"); v != "" {
+			HttpAddr = v
+		} else {
+			HttpAddr = AppConfig.String("HttpAddr")
+		}
 
 		if v, err := AppConfig.Int("HttpPort"); err == nil {
 			HttpPort = v
-- 
GitLab