X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8a286717d5f4f549570d81533f746ba838b73d30..68463d51530a921dd965075e1721744c75322703:/services/arv-git-httpd/gitolite_test.go diff --git a/services/arv-git-httpd/gitolite_test.go b/services/arv-git-httpd/gitolite_test.go index 96d9d24562..38ff2309c1 100644 --- a/services/arv-git-httpd/gitolite_test.go +++ b/services/arv-git-httpd/gitolite_test.go @@ -7,6 +7,7 @@ import ( "strings" "git.curoverse.com/arvados.git/sdk/go/arvados" + "git.curoverse.com/arvados.git/sdk/go/arvadostest" check "gopkg.in/check.v1" ) @@ -44,11 +45,13 @@ func (s *GitoliteSuite) SetUpTest(c *check.C) { s.tmpRepoRoot = s.gitoliteHome + "/repositories" s.Config = &Config{ Client: arvados.Client{ - APIHost: os.Getenv("ARVADOS_API_HOST"), + APIHost: arvadostest.APIHost(), + Insecure: true, }, - Listen: ":0", - GitCommand: "/usr/share/gitolite3/gitolite-shell", - Root: s.tmpRepoRoot, + Listen: ":0", + GitCommand: "/usr/share/gitolite3/gitolite-shell", + GitoliteHome: s.gitoliteHome, + RepoRoot: s.tmpRepoRoot, } s.IntegrationSuite.SetUpTest(c) @@ -56,9 +59,6 @@ func (s *GitoliteSuite) SetUpTest(c *check.C) { // (*IntegrationTest)SetUpTest() -- see 2.2.4 at // http://gitolite.com/gitolite/gitolite.html runGitolite("gitolite", "setup") - - os.Setenv("GITOLITE_HTTP_HOME", s.gitoliteHome) - os.Setenv("GL_BYPASS_ACCESS_CHECKS", "1") } func (s *GitoliteSuite) TearDownTest(c *check.C) {