6260: status check added; still not working completely since invoking datamanager...

[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 77c4d3bb3ba190b5235a897d39cfc7b91442a514..c1364ca75b22ce18a72c74ffadf9667a69bf1225 100644 (file)
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -80,15 +80,33 @@ func (s *IntegrationSuite) TestExpiredToken(c *check.C) {
 
 func (s *IntegrationSuite) TestInvalidToken(c *check.C) {
        for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
-               err := s.runGit(c, "no-such-token-in-the-system", "fetch", repo)
+               err := s.runGit(c, "s3cr3tp@ssw0rd", "fetch", repo)
+               c.Assert(err, check.ErrorMatches, `.* requested URL returned error.*`)
+       }
+}
+
+func (s *IntegrationSuite) TestShortToken(c *check.C) {
+       for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
+               err := s.runGit(c, "s3cr3t", "fetch", repo)
                c.Assert(err, check.ErrorMatches, `.* 500 while accessing.*`)
        }
 }
 
+func (s *IntegrationSuite) TestShortTokenBadReq(c *check.C) {
+       for _, repo := range []string{"bogus"} {
+               err := s.runGit(c, "s3cr3t", "fetch", repo)
+               c.Assert(err, check.ErrorMatches, `.* requested URL returned error.*`)
+       }
+}
+
 func (s *IntegrationSuite) SetUpSuite(c *check.C) {
        arvadostest.StartAPI()
 }
 
+func (s *IntegrationSuite) TearDownSuite(c *check.C) {
+       arvadostest.StopAPI()
+}
+
 func (s *IntegrationSuite) SetUpTest(c *check.C) {
        arvadostest.ResetEnv()
        s.testServer = &server{}
@@ -118,7 +136,7 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
        c.Assert(err, check.Equals, nil)
 
        theConfig = &config{
-               Addr:       ":",
+               Addr:       ":0",
                GitCommand: "/usr/bin/git",
                Root:       s.tmpRepoRoot,
        }