Make integration tests more user-friendly (#2536)

release/v1.15
Ethan Koenig 2017-09-18 01:35:42 -07:00 committed by Lunny Xiao
parent b0f7457d9e
commit 6c6533fb31
1 changed files with 5 additions and 1 deletions

View File

@ -74,6 +74,10 @@ func initIntegrationTest() {
os.Exit(1) os.Exit(1)
} }
setting.AppPath = path.Join(giteaRoot, "gitea") setting.AppPath = path.Join(giteaRoot, "gitea")
if _, err := os.Stat(setting.AppPath); err != nil {
fmt.Printf("Could not find gitea binary at %s\n", setting.AppPath)
os.Exit(1)
}
giteaConf := os.Getenv("GITEA_CONF") giteaConf := os.Getenv("GITEA_CONF")
if giteaConf == "" { if giteaConf == "" {
@ -276,7 +280,7 @@ func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *TestRespo
mac.ServeHTTP(respWriter, req) mac.ServeHTTP(respWriter, req)
if expectedStatus != NoExpectedStatus { if expectedStatus != NoExpectedStatus {
assert.EqualValues(t, expectedStatus, respWriter.HeaderCode, assert.EqualValues(t, expectedStatus, respWriter.HeaderCode,
"Request URL: %s %s", req.URL.String(), buffer.String()) "Request URL: %s", req.URL.String())
} }
return &TestResponse{ return &TestResponse{
HeaderCode: respWriter.HeaderCode, HeaderCode: respWriter.HeaderCode,