projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8567: Adjust job container resolve test now that images are filtered based on
[arvados.git]
/
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 d21a814a61ab88499f0434de5dc73fba1b0a7fc3..38ff2309c1d2a3a57def17ac588276dab204e265 100644
(file)
--- 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"
"strings"
"git.curoverse.com/arvados.git/sdk/go/arvados"
+ "git.curoverse.com/arvados.git/sdk/go/arvadostest"
check "gopkg.in/check.v1"
)
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{
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)
}
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")
// (*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) {
}
func (s *GitoliteSuite) TearDownTest(c *check.C) {