Merge branch '18696-rnaseq-training' refs #18696

[arvados.git] / services / arv-git-httpd / server_test.go

diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index cba82fe3f299177851d847189bf9313d112f438d..a92aa1fb861ca2f24739d0e7a288e6a88f19733f 100644 (file)
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -31,70 +31,70 @@ type GitSuite struct {
 func (s *GitSuite) TestPathVariants(c *check.C) {
        s.makeArvadosRepo(c)
        for _, repo := range []string{"active/foo.git", "active/foo/.git", "arvados.git", "arvados/.git"} {
-               err := s.RunGit(c, spectatorToken, "fetch", repo)
+               err := s.RunGit(c, spectatorToken, "fetch", repo, "refs/heads/main")
                c.Assert(err, check.Equals, nil)
        }
 }
 
 func (s *GitSuite) TestReadonly(c *check.C) {
-       err := s.RunGit(c, spectatorToken, "fetch", "active/foo.git")
+       err := s.RunGit(c, spectatorToken, "fetch", "active/foo.git", "refs/heads/main")
        c.Assert(err, check.Equals, nil)
-       err = s.RunGit(c, spectatorToken, "push", "active/foo.git", "master:newbranchfail")
+       err = s.RunGit(c, spectatorToken, "push", "active/foo.git", "main:newbranchfail")
        c.Assert(err, check.ErrorMatches, `.*HTTP (code = )?403.*`)
        _, err = os.Stat(s.tmpRepoRoot + "/zzzzz-s0uqq-382brsig8rp3666.git/refs/heads/newbranchfail")
        c.Assert(err, check.FitsTypeOf, &os.PathError{})
 }
 
 func (s *GitSuite) TestReadwrite(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.Assert(err, check.Equals, nil)
-       err = s.RunGit(c, activeToken, "push", "active/foo.git", "master:newbranch")
+       err = s.RunGit(c, activeToken, "push", "active/foo.git", "main:newbranch")
        c.Assert(err, check.Equals, nil)
        _, err = os.Stat(s.tmpRepoRoot + "/zzzzz-s0uqq-382brsig8rp3666.git/refs/heads/newbranch")
        c.Assert(err, check.Equals, nil)
 }
 
 func (s *GitSuite) TestNonexistent(c *check.C) {
-       err := s.RunGit(c, spectatorToken, "fetch", "thisrepodoesnotexist.git")
+       err := s.RunGit(c, spectatorToken, "fetch", "thisrepodoesnotexist.git", "refs/heads/main")
        c.Assert(err, check.ErrorMatches, `.* not found.*`)
 }
 
 func (s *GitSuite) TestMissingGitdirReadableRepository(c *check.C) {
-       err := s.RunGit(c, activeToken, "fetch", "active/foo2.git")
+       err := s.RunGit(c, activeToken, "fetch", "active/foo2.git", "refs/heads/main")
        c.Assert(err, check.ErrorMatches, `.* not found.*`)
 }
 
 func (s *GitSuite) TestNoPermission(c *check.C) {
        for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
-               err := s.RunGit(c, anonymousToken, "fetch", repo)
+               err := s.RunGit(c, anonymousToken, "fetch", repo, "refs/heads/main")
                c.Assert(err, check.ErrorMatches, `.* not found.*`)
        }
 }
 
 func (s *GitSuite) TestExpiredToken(c *check.C) {
        for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
-               err := s.RunGit(c, expiredToken, "fetch", repo)
+               err := s.RunGit(c, expiredToken, "fetch", repo, "refs/heads/main")
                c.Assert(err, check.ErrorMatches, `.* (500 while accessing|requested URL returned error: 500).*`)
        }
 }
 
 func (s *GitSuite) TestInvalidToken(c *check.C) {
        for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
-               err := s.RunGit(c, "s3cr3tp@ssw0rd", "fetch", repo)
+               err := s.RunGit(c, "s3cr3tp@ssw0rd", "fetch", repo, "refs/heads/main")
                c.Assert(err, check.ErrorMatches, `.* requested URL returned error.*`)
        }
 }
 
 func (s *GitSuite) TestShortToken(c *check.C) {
        for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
-               err := s.RunGit(c, "s3cr3t", "fetch", repo)
+               err := s.RunGit(c, "s3cr3t", "fetch", repo, "refs/heads/main")
                c.Assert(err, check.ErrorMatches, `.* (500 while accessing|requested URL returned error: 500).*`)
        }
 }
 
 func (s *GitSuite) TestShortTokenBadReq(c *check.C) {
        for _, repo := range []string{"bogus"} {
-               err := s.RunGit(c, "s3cr3t", "fetch", repo)
+               err := s.RunGit(c, "s3cr3t", "fetch", repo, "refs/heads/main")
                c.Assert(err, check.ErrorMatches, `.*not found.*`)
        }
 }
@@ -104,7 +104,7 @@ func (s *GitSuite) makeArvadosRepo(c *check.C) {
        msg, err := exec.Command("git", "init", "--bare", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git").CombinedOutput()
        c.Log(string(msg))
        c.Assert(err, check.Equals, nil)
-       msg, err = exec.Command("git", "--git-dir", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git", "fetch", "../../.git", "HEAD:master").CombinedOutput()
+       msg, err = exec.Command("git", "--git-dir", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git", "fetch", "../../.git", "HEAD:main").CombinedOutput()
        c.Log(string(msg))
        c.Assert(err, check.Equals, nil)
 }