X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/35d15b6e1fcd793d8e279588dea878101c3ab055..5412a019a3f0c1cb2bff3b344f63e9a48a911026:/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 386205d37f..a92aa1fb86 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -31,13 +31,13 @@ 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", "main:newbranchfail")
 	c.Assert(err, check.ErrorMatches, `.*HTTP (code = )?403.*`)
@@ -46,7 +46,7 @@ func (s *GitSuite) TestReadonly(c *check.C) {
 }
 
 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", "main:newbranch")
 	c.Assert(err, check.Equals, nil)
@@ -55,46 +55,46 @@ func (s *GitSuite) TestReadwrite(c *check.C) {
 }
 
 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.*`)
 	}
 }