[ARVADOS] updated: d805ea58fa7f4fce9e457df7073b1b414249d2ed

[git at public.curoverse.com]

Summary of changes:
 services/arv-git-httpd/server_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  d805ea58fa7f4fce9e457df7073b1b414249d2ed (commit)
       via  21047149d6b42845f563a480b5067b9e4b0d895c (commit)
      from  9a34f5ed292fb8d2f262e4c23e758cd689d81db7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d805ea58fa7f4fce9e457df7073b1b414249d2ed
Merge: 9a34f5e 2104714
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Sep 11 14:41:28 2015 -0400

    Merge branch 'wtsi-hgi-fix/7310-git-v2-http-500-error-matches' fixes #7310


commit 21047149d6b42845f563a480b5067b9e4b0d895c
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date:   Fri Sep 11 15:08:44 2015 +0000

    7310: adds git v2 style regex to match http 500 error

diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index 2d1aeb7..ea8dc04 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -66,7 +66,7 @@ func (s *GitSuite) TestNoPermission(c *check.C) {
 func (s *GitSuite) TestExpiredToken(c *check.C) {
 	for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
 		err := s.RunGit(c, expiredToken, "fetch", repo)
-		c.Assert(err, check.ErrorMatches, `.* 500 while accessing.*`)
+		c.Assert(err, check.ErrorMatches, `.* (500 while accessing|requested URL returned error: 500).*`)
 	}
 }
 
@@ -80,7 +80,7 @@ func (s *GitSuite) TestInvalidToken(c *check.C) {
 func (s *GitSuite) 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.*`)
+		c.Assert(err, check.ErrorMatches, `.* (500 while accessing|requested URL returned error: 500).*`)
 	}
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--