X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6e1c29f2530ff36892ebe64a81e3d962766763de..b02fc7b2227e923beb4d47daee7949c94b90da5f:/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 d21a814a61..0656cbf89a 100644
--- a/services/arv-git-httpd/gitolite_test.go
+++ b/services/arv-git-httpd/gitolite_test.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -7,6 +11,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 +49,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",
-		RepoRoot:   s.tmpRepoRoot,
+		Listen:       ":0",
+		GitCommand:   "/usr/share/gitolite3/gitolite-shell",
+		GitoliteHome: s.gitoliteHome,
+		RepoRoot:     s.tmpRepoRoot,
 	}
 	s.IntegrationSuite.SetUpTest(c)
 
@@ -56,9 +63,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) {
@@ -103,5 +107,5 @@ func (s *GitoliteSuite) TestPush(c *check.C) {
 
 func (s *GitoliteSuite) TestPushUnwritable(c *check.C) {
 	err := s.RunGit(c, spectatorToken, "push", "active/foo.git", "master:gitolite-push-fail")
-	c.Check(err, check.ErrorMatches, `.*HTTP code = 403.*`)
+	c.Check(err, check.ErrorMatches, `.*HTTP (code = )?403.*`)
 }