projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18941: clamp prefetch to 6
[arvados.git]
/
services
/
arv-git-httpd
/
auth_handler_test.go
diff --git
a/services/arv-git-httpd/auth_handler_test.go
b/services/arv-git-httpd/auth_handler_test.go
index 568570942e1f143c0f89725bc20cf372512d8983..688b256dcb0c20aeb5fb7a30fd7144eb1e25f01c 100644
(file)
--- a/
services/arv-git-httpd/auth_handler_test.go
+++ b/
services/arv-git-httpd/auth_handler_test.go
@@
-13,9
+13,10
@@
import (
"path/filepath"
"strings"
"path/filepath"
"strings"
- "git.curoverse.com/arvados.git/lib/config"
- "git.curoverse.com/arvados.git/sdk/go/arvados"
- "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+ "git.arvados.org/arvados.git/lib/config"
+ "git.arvados.org/arvados.git/sdk/go/arvados"
+ "git.arvados.org/arvados.git/sdk/go/arvadostest"
+ "git.arvados.org/arvados.git/sdk/go/ctxlog"
check "gopkg.in/check.v1"
)
check "gopkg.in/check.v1"
)
@@
-25,25
+26,17
@@
type AuthHandlerSuite struct {
cluster *arvados.Cluster
}
cluster *arvados.Cluster
}
-func (s *AuthHandlerSuite) SetUpSuite(c *check.C) {
- arvadostest.StartAPI()
-}
-
-func (s *AuthHandlerSuite) TearDownSuite(c *check.C) {
- arvadostest.StopAPI()
-}
-
func (s *AuthHandlerSuite) SetUpTest(c *check.C) {
arvadostest.ResetEnv()
repoRoot, err := filepath.Abs("../api/tmp/git/test")
c.Assert(err, check.IsNil)
func (s *AuthHandlerSuite) SetUpTest(c *check.C) {
arvadostest.ResetEnv()
repoRoot, err := filepath.Abs("../api/tmp/git/test")
c.Assert(err, check.IsNil)
- cfg, err := config.NewLoader(nil,
nil
).Load()
+ 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:0"}: arvados.ServiceInstance
{}}
+ s.cluster.Services.GitHTTP.InternalURLs = map[arvados.URL]arvados.ServiceInstance{
{Host: "localhost:0"}:
{}}
s.cluster.TLS.Insecure = true
s.cluster.Git.GitCommand = "/usr/bin/git"
s.cluster.Git.Repositories = repoRoot
s.cluster.TLS.Insecure = true
s.cluster.Git.GitCommand = "/usr/bin/git"
s.cluster.Git.Repositories = repoRoot