1
0
mirror of https://github.com/astaxie/beego.git synced 2024-12-23 07:40:49 +00:00

fix test error

This commit is contained in:
coseyo 2016-01-24 00:40:03 +08:00
parent 4c1cfc1386
commit 3031bdd176

View File

@ -185,18 +185,17 @@ func ParseConfig() (err error) {
workPath, _ := os.Getwd()
workPath, _ = filepath.Abs(workPath)
if workPath != AppPath {
os.Chdir(AppPath)
}
if AppConfigPath == "" {
// initialize default configurations
AppConfigPath = filepath.Join(AppPath, "conf", "app.conf")
if !utils.FileExists(AppConfigPath) {
if utils.FileExists(AppConfigPath) && workPath != AppPath {
os.Chdir(AppPath)
} else {
AppConfig = &beegoAppConfig{config.NewFakeConfig()}
return
}
}
AppConfig, err = newAppConfig(AppConfigProvider, AppConfigPath)
if err != nil {
return err