Merge branch '15648-centos7-upgrade-to-rh-python36'

[arvados.git] / services / arv-git-httpd / git_handler_test.go

diff --git a/services/arv-git-httpd/git_handler_test.go b/services/arv-git-httpd/git_handler_test.go
index 8417b57e4d96743fbccdc88893a8e8ec18723f05..d5cb275fd8fea3613584ff809095a5c8094407c5 100644 (file)
--- a/services/arv-git-httpd/git_handler_test.go
+++ b/services/arv-git-httpd/git_handler_test.go
@@ -21,8 +21,7 @@ type GitHandlerSuite struct {
        cluster *arvados.Cluster
 }
 
-func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
-
+func (s *GitHandlerSuite) SetUpTest(c *check.C) {
        cfg, err := config.NewLoader(nil, nil).Load()
        c.Assert(err, check.Equals, nil)
        s.cluster, err = cfg.GetCluster("")
@@ -31,7 +30,9 @@ func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
        s.cluster.Services.GitHTTP.InternalURLs = map[arvados.URL]arvados.ServiceInstance{arvados.URL{Host: "localhost:80"}: arvados.ServiceInstance{}}
        s.cluster.Git.GitoliteHome = "/test/ghh"
        s.cluster.Git.Repositories = "/"
+}
 
+func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
        u, err := url.Parse("git.zzzzz.arvadosapi.com/test")
        c.Check(err, check.Equals, nil)
        resp := httptest.NewRecorder()