X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f4bc86376bd9f0f4cd10aad9296763a089cecd2a..918e16de43e993894dcaffbe0cafa0fc1d2f16b3:/services/arv-git-httpd/git_handler_test.go?ds=sidebyside

diff --git a/services/arv-git-httpd/git_handler_test.go b/services/arv-git-httpd/git_handler_test.go
index 35c2f4884f..6b08eeecdc 100644
--- a/services/arv-git-httpd/git_handler_test.go
+++ b/services/arv-git-httpd/git_handler_test.go
@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"os"
 	"regexp"
 
 	check "gopkg.in/check.v1"
@@ -15,6 +14,10 @@ var _ = check.Suite(&GitHandlerSuite{})
 type GitHandlerSuite struct{}
 
 func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
+	theConfig = defaultConfig()
+	theConfig.RepoRoot = "/"
+	theConfig.GitoliteHome = "/test/ghh"
+
 	u, err := url.Parse("git.zzzzz.arvadosapi.com/test")
 	c.Check(err, check.Equals, nil)
 	resp := httptest.NewRecorder()
@@ -26,18 +29,17 @@ func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
 	h := newGitHandler()
 	h.(*gitHandler).Path = "/bin/sh"
 	h.(*gitHandler).Args = []string{"-c", "printf 'Content-Type: text/plain\r\n\r\n'; env"}
-	os.Setenv("GITOLITE_HTTP_HOME", "/test/ghh")
-	os.Setenv("GL_BYPASS_ACCESS_CHECKS", "yesplease")
 
 	h.ServeHTTP(resp, req)
 
 	c.Check(resp.Code, check.Equals, http.StatusOK)
 	body := resp.Body.String()
+	c.Check(body, check.Matches, `(?ms).*^PATH=.*:/test/ghh/bin$.*`)
 	c.Check(body, check.Matches, `(?ms).*^GITOLITE_HTTP_HOME=/test/ghh$.*`)
-	c.Check(body, check.Matches, `(?ms).*^GL_BYPASS_ACCESS_CHECKS=yesplease$.*`)
+	c.Check(body, check.Matches, `(?ms).*^GL_BYPASS_ACCESS_CHECKS=1$.*`)
 	c.Check(body, check.Matches, `(?ms).*^REMOTE_HOST=::1$.*`)
 	c.Check(body, check.Matches, `(?ms).*^REMOTE_PORT=12345$.*`)
-	c.Check(body, check.Matches, `(?ms).*^SERVER_ADDR=`+regexp.QuoteMeta(theConfig.Addr)+`$.*`)
+	c.Check(body, check.Matches, `(?ms).*^SERVER_ADDR=`+regexp.QuoteMeta(theConfig.Listen)+`$.*`)
 }
 
 func (s *GitHandlerSuite) TestCGIErrorOnSplitHostPortError(c *check.C) {