Fix setting.AppPath for integration tests (#1923)
Fix setting.AppPath for integration tests
This commit is contained in:
		
				commit
				
					
						889409ba31
					
				
			
		
					 1 changed files with 14 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -14,6 +14,7 @@ import (
 | 
			
		|||
	"net/http/cookiejar"
 | 
			
		||||
	"net/url"
 | 
			
		||||
	"os"
 | 
			
		||||
	"path"
 | 
			
		||||
	"strings"
 | 
			
		||||
	"testing"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -59,14 +60,22 @@ func TestMain(m *testing.M) {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
func initIntegrationTest() {
 | 
			
		||||
	if setting.CustomConf = os.Getenv("GITEA_CONF"); setting.CustomConf == "" {
 | 
			
		||||
		fmt.Println("Environment variable $GITEA_CONF not set")
 | 
			
		||||
		os.Exit(1)
 | 
			
		||||
	}
 | 
			
		||||
	if os.Getenv("GITEA_ROOT") == "" {
 | 
			
		||||
	giteaRoot := os.Getenv("GITEA_ROOT")
 | 
			
		||||
	if giteaRoot == "" {
 | 
			
		||||
		fmt.Println("Environment variable $GITEA_ROOT not set")
 | 
			
		||||
		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()
 | 
			
		||||
	models.LoadConfigs()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue