projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17204: Fix misleading log message on 304 Not Modified response.
[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..dafe5d31d7f3b3c0dc49145a6232653ef0c075a5 100644
(file)
--- a/
services/arv-git-httpd/git_handler_test.go
+++ b/
services/arv-git-httpd/git_handler_test.go
@@
-10,8
+10,9
@@
import (
"net/url"
"regexp"
"net/url"
"regexp"
- "git.curoverse.com/arvados.git/lib/config"
- "git.curoverse.com/arvados.git/sdk/go/arvados"
+ "git.arvados.org/arvados.git/lib/config"
+ "git.arvados.org/arvados.git/sdk/go/arvados"
+ "git.arvados.org/arvados.git/sdk/go/ctxlog"
check "gopkg.in/check.v1"
)
check "gopkg.in/check.v1"
)
@@
-21,17
+22,18
@@
type GitHandlerSuite struct {
cluster *arvados.Cluster
}
cluster *arvados.Cluster
}
-func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
-
- cfg, err := config.NewLoader(nil, nil).Load()
+func (s *GitHandlerSuite) SetUpTest(c *check.C) {
+ cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
c.Assert(err, check.Equals, nil)
s.cluster, err = cfg.GetCluster("")
c.Assert(err, check.Equals, nil)
c.Assert(err, check.Equals, nil)
s.cluster, err = cfg.GetCluster("")
c.Assert(err, check.Equals, nil)
- s.cluster.Services.GitHTTP.InternalURLs = map[arvados.URL]arvados.ServiceInstance{
arvados.URL{Host: "localhost:80"}: arvados.ServiceInstance
{}}
+ s.cluster.Services.GitHTTP.InternalURLs = map[arvados.URL]arvados.ServiceInstance{
{Host: "localhost:80"}:
{}}
s.cluster.Git.GitoliteHome = "/test/ghh"
s.cluster.Git.Repositories = "/"
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()
u, err := url.Parse("git.zzzzz.arvadosapi.com/test")
c.Check(err, check.Equals, nil)
resp := httptest.NewRecorder()