Merge branch 'master' into 5365-not-link-unreadables

[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 751e7e41c484fb659b6d875b75bb62124b4372e4..5796445d682d391582cf20b1fc50aaeed0311c75 100644 (file)
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -25,7 +25,7 @@ func (s *IntegrationSuite) TestPathVariants(c *check.C) {
        s.makeArvadosRepo(c)
        // Spectator token
        os.Setenv("ARVADOS_API_TOKEN", "zw2f4gwx8hw8cjre7yp6v1zylhrhn3m5gvjq73rtpwhmknrybu")
-       for _, repo := range []string{"foo.git", "foo/.git", "arvados.git", "arvados/.git"} {
+       for _, repo := range []string{"active/foo.git", "active/foo/.git", "arvados.git", "arvados/.git"} {
                err := s.runGit(c, "fetch", repo)
                c.Assert(err, check.Equals, nil)
        }
@@ -34,22 +34,22 @@ func (s *IntegrationSuite) TestPathVariants(c *check.C) {
 func (s *IntegrationSuite) TestReadonly(c *check.C) {
        // Spectator token
        os.Setenv("ARVADOS_API_TOKEN", "zw2f4gwx8hw8cjre7yp6v1zylhrhn3m5gvjq73rtpwhmknrybu")
-       err := s.runGit(c, "fetch", "foo.git")
+       err := s.runGit(c, "fetch", "active/foo.git")
        c.Assert(err, check.Equals, nil)
-       err = s.runGit(c, "push", "foo.git", "master:newbranchfail")
+       err = s.runGit(c, "push", "active/foo.git", "master:newbranchfail")
        c.Assert(err, check.ErrorMatches, `.*HTTP code = 403.*`)
-       _, err = os.Stat(s.tmpRepoRoot + "/.git/refs/heads/newbranchfail")
+       _, err = os.Stat(s.tmpRepoRoot + "/zzzzz-s0uqq-382brsig8rp3666/.git/refs/heads/newbranchfail")
        c.Assert(err, check.FitsTypeOf, &os.PathError{})
 }
 
 func (s *IntegrationSuite) TestReadwrite(c *check.C) {
        // Active user token
        os.Setenv("ARVADOS_API_TOKEN", "3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi")
-       err := s.runGit(c, "fetch", "foo.git")
+       err := s.runGit(c, "fetch", "active/foo.git")
        c.Assert(err, check.Equals, nil)
-       err = s.runGit(c, "push", "foo.git", "master:newbranch")
+       err = s.runGit(c, "push", "active/foo.git", "master:newbranch")
        c.Assert(err, check.Equals, nil)
-       _, err = os.Stat(s.tmpRepoRoot + "/foo/.git/refs/heads/newbranch")
+       _, err = os.Stat(s.tmpRepoRoot + "/zzzzz-s0uqq-382brsig8rp3666/.git/refs/heads/newbranch")
        c.Assert(err, check.Equals, nil)
 }
 
@@ -63,7 +63,7 @@ func (s *IntegrationSuite) TestNonexistent(c *check.C) {
 func (s *IntegrationSuite) TestNoPermission(c *check.C) {
        // Anonymous token
        os.Setenv("ARVADOS_API_TOKEN", "4kg6k6lzmp9kj4cpkcoxie964cmvjahbt4fod9zru44k4jqdmi")
-       for _, repo := range []string{"foo.git", "foo/.git"} {
+       for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
                err := s.runGit(c, "fetch", repo)
                c.Assert(err, check.ErrorMatches, `.* not found.*`)
        }
@@ -81,9 +81,9 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
        c.Assert(err, check.Equals, nil)
        s.tmpWorkdir, err = ioutil.TempDir("", "arv-git-httpd")
        c.Assert(err, check.Equals, nil)
-       _, err = exec.Command("git", "init", s.tmpRepoRoot+"/foo").Output()
+       _, err = exec.Command("git", "init", s.tmpRepoRoot+"/zzzzz-s0uqq-382brsig8rp3666").Output()
        c.Assert(err, check.Equals, nil)
-       _, err = exec.Command("sh", "-c", "cd "+s.tmpRepoRoot+"/foo && echo test >test && git add test && git commit -am 'foo: test'").CombinedOutput()
+       _, err = exec.Command("sh", "-c", "cd "+s.tmpRepoRoot+"/zzzzz-s0uqq-382brsig8rp3666 && echo test >test && git add test && git commit -am 'foo: test'").CombinedOutput()
        c.Assert(err, check.Equals, nil)
        _, err = exec.Command("git", "init", s.tmpWorkdir).Output()
        c.Assert(err, check.Equals, nil)
@@ -105,7 +105,7 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
        _, err = exec.Command("git", "config",
                "--file", s.tmpWorkdir+"/.git/config",
                "credential.http://"+s.testServer.Addr+"/.helper",
-               "!foo(){ echo password=$ARVADOS_API_TOKEN; };foo").Output()
+               "!cred(){ echo password=$ARVADOS_API_TOKEN; };cred").Output()
        c.Assert(err, check.Equals, nil)
        _, err = exec.Command("git", "config",
                "--file", s.tmpWorkdir+"/.git/config",
@@ -157,9 +157,9 @@ func (s *IntegrationSuite) runGit(c *check.C, gitCmd, repo string, args ...strin
 
 // Make a bare arvados repo at {tmpRepoRoot}/arvados.git
 func (s *IntegrationSuite) makeArvadosRepo(c *check.C) {
-       _, err := exec.Command("git", "init", "--bare", s.tmpRepoRoot+"/arvados.git").Output()
+       _, err := exec.Command("git", "init", "--bare", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git").Output()
        c.Assert(err, check.Equals, nil)
-       _, err = exec.Command("git", "--git-dir", s.tmpRepoRoot+"/arvados.git", "fetch", "../../.git", "master:master").Output()
+       _, err = exec.Command("git", "--git-dir", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git", "fetch", "../../.git", "master:master").Output()
        c.Assert(err, check.Equals, nil)
 }