Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix setting.AppPath for integration tests (#1923)

Browse Source 
Fix setting.AppPath for integration tests
This commit is contained in:
Kim "BKC" Carlbäcker 2017-06-13 04:20:32 +02:00 committed by GitHub
commit 889409ba31
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
integrations/integration_test.go
View File

@ -14,6 +14,7 @@ import (
"net/http/cookiejar" "net/http/cookiejar"
"net/url" "net/url"
"os" "os"
"path"
"strings" "strings"
"testing" "testing"
@ -59,14 +60,22 @@ func TestMain(m *testing.M) {
} }
func initIntegrationTest() { func initIntegrationTest() {
if setting.CustomConf = os.Getenv("GITEA_CONF"); setting.CustomConf == "" { giteaRoot := os.Getenv("GITEA_ROOT")
fmt.Println("Environment variable $GITEA_CONF not set") if giteaRoot == "" {
os.Exit(1)
}
if os.Getenv("GITEA_ROOT") == "" {
fmt.Println("Environment variable $GITEA_ROOT not set") fmt.Println("Environment variable $GITEA_ROOT not set")
os.Exit(1) os.Exit(1)
} }
setting.AppPath = path.Join(giteaRoot, "gitea")
giteaConf := os.Getenv("GITEA_CONF")
if giteaConf == "" {
fmt.Println("Environment variable $GITEA_CONF not set")
os.Exit(1)
} else if !path.IsAbs(giteaConf) {
setting.CustomConf = path.Join(giteaRoot, giteaConf)
} else {
setting.CustomConf = giteaConf
}
setting.NewContext() setting.NewContext()
models.LoadConfigs() models.LoadConfigs()