projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18947: Use git-ls-files instead of git-grep to find go dirs.
[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 eaa7b55f8381f0b4097d751b2aad39866babe355..cfedd88f170841dc9fbc16a0ebbc0a0127de5459 100644
(file)
--- a/
services/arv-git-httpd/gitolite_test.go
+++ b/
services/arv-git-httpd/gitolite_test.go
@@
-10,8
+10,9
@@
import (
"os/exec"
"strings"
"os/exec"
"strings"
- "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"
)
@@
-48,12
+49,12
@@
func (s *GitoliteSuite) SetUpTest(c *check.C) {
s.tmpRepoRoot = s.gitoliteHome + "/repositories"
s.tmpRepoRoot = s.gitoliteHome + "/repositories"
- 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/share/gitolite3/gitolite-shell"
s.cluster.Git.GitoliteHome = s.gitoliteHome
s.cluster.TLS.Insecure = true
s.cluster.Git.GitCommand = "/usr/share/gitolite3/gitolite-shell"
s.cluster.Git.GitoliteHome = s.gitoliteHome
@@
-80,7
+81,7
@@
func (s *GitoliteSuite) TearDownTest(c *check.C) {
}
func (s *GitoliteSuite) TestFetch(c *check.C) {
}
func (s *GitoliteSuite) TestFetch(c *check.C) {
- err := s.RunGit(c, activeToken, "fetch", "active/foo.git")
+ err := s.RunGit(c, activeToken, "fetch", "active/foo.git"
, "refs/heads/main"
)
c.Check(err, check.Equals, nil)
}
c.Check(err, check.Equals, nil)
}
@@
-90,7
+91,7
@@
func (s *GitoliteSuite) TestFetchUnreadable(c *check.C) {
}
func (s *GitoliteSuite) TestPush(c *check.C) {
}
func (s *GitoliteSuite) TestPush(c *check.C) {
- err := s.RunGit(c, activeToken, "push", "active/foo.git", "ma
ster
:gitolite-push")
+ err := s.RunGit(c, activeToken, "push", "active/foo.git", "ma
in
:gitolite-push")
c.Check(err, check.Equals, nil)
// Check that the commit hash appears in the gitolite log, as
c.Check(err, check.Equals, nil)
// Check that the commit hash appears in the gitolite log, as
@@
-108,6
+109,6
@@
func (s *GitoliteSuite) TestPush(c *check.C) {
}
func (s *GitoliteSuite) TestPushUnwritable(c *check.C) {
}
func (s *GitoliteSuite) TestPushUnwritable(c *check.C) {
- err := s.RunGit(c, spectatorToken, "push", "active/foo.git", "ma
ster
:gitolite-push-fail")
+ err := s.RunGit(c, spectatorToken, "push", "active/foo.git", "ma
in
:gitolite-push-fail")
c.Check(err, check.ErrorMatches, `.*HTTP (code = )?403.*`)
}
c.Check(err, check.ErrorMatches, `.*HTTP (code = )?403.*`)
}