lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix stray directories generated by integration tests (#1134)

release/v1.15
Mura Li 2017-03-07 15:38:26 +08:00 committed by Lunny Xiao
parent fa41ddd3eb
commit 288226e13c
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
integrations/install_test.go
View File

@ -9,7 +9,6 @@ import (
"net/http" "net/http"
"os" "os"
"os/user" "os/user"
"path/filepath"
"testing" "testing"
"time" "time"
@ -21,19 +20,19 @@ const ServerHTTPPort = "3001"
const _RetryLimit = 10 const _RetryLimit = 10
func makeSimpleSettings(user, workdir, port string) map[string][]string { func makeSimpleSettings(user, port string) map[string][]string {
return map[string][]string{ return map[string][]string{
"db_type": {"SQLite3"}, "db_type": {"SQLite3"},
"db_host": {"localhost"}, "db_host": {"localhost"},
"db_path": {workdir + "data/gitea.db"}, "db_path": {"data/gitea.db"},
"app_name": {"Gitea: Git with a cup of tea"}, "app_name": {"Gitea: Git with a cup of tea"},
"repo_root_path": {workdir + "repositories"}, "repo_root_path": {"repositories"},
"run_user": {user}, "run_user": {user},
"domain": {"localhost"}, "domain": {"localhost"},
"ssh_port": {"22"}, "ssh_port": {"22"},
"http_port": {port}, "http_port": {port},
"app_url": {"http://localhost:" + port}, "app_url": {"http://localhost:" + port},
"log_root_path": {workdir + "log"}, "log_root_path": {"log"},
} }
} }
@ -65,12 +64,7 @@ func install(t *utils.T) error {
return err return err
} }
path, err := filepath.Abs(t.Config.WorkDir) settings := makeSimpleSettings(_user.Username, ServerHTTPPort)
if err != nil {
return err
}
settings := makeSimpleSettings(_user.Username, path, ServerHTTPPort)
r, err = http.PostForm("http://:"+ServerHTTPPort+"/install", settings) r, err = http.PostForm("http://:"+ServerHTTPPort+"/install", settings)
if err != nil { if err != nil {
return err return err