[ARVADOS] updated: b1f306a081877abb347f5dff6ff63ff09cf1f7a4

[Git user]

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

       via  b1f306a081877abb347f5dff6ff63ff09cf1f7a4 (commit)
       via  23f0d2b4f4181e3460e106c1c0b5764c993bb49e (commit)
      from  edf37e92f885ed4d5bcf587317cc9c6d90d8ece1 (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 b1f306a081877abb347f5dff6ff63ff09cf1f7a4
Merge: edf37e9 23f0d2b
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jul 10 17:06:26 2017 -0400

    Merge branch '11950-stretch'
    
    refs #11950
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>


commit 23f0d2b4f4181e3460e106c1c0b5764c993bb49e
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jul 10 14:28:46 2017 -0400

    11950: Recognize new (2.11.0, debian9) git error messages.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/services/arv-git-httpd/gitolite_test.go b/services/arv-git-httpd/gitolite_test.go
index f06b1ac..0656cbf 100644
--- a/services/arv-git-httpd/gitolite_test.go
+++ b/services/arv-git-httpd/gitolite_test.go
@@ -107,5 +107,5 @@ func (s *GitoliteSuite) TestPush(c *check.C) {
 
 func (s *GitoliteSuite) TestPushUnwritable(c *check.C) {
 	err := s.RunGit(c, spectatorToken, "push", "active/foo.git", "master:gitolite-push-fail")
-	c.Check(err, check.ErrorMatches, `.*HTTP code = 403.*`)
+	c.Check(err, check.ErrorMatches, `.*HTTP (code = )?403.*`)
 }
diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index 241ec33..4533601 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -36,7 +36,7 @@ func (s *GitSuite) TestReadonly(c *check.C) {
 	err := s.RunGit(c, spectatorToken, "fetch", "active/foo.git")
 	c.Assert(err, check.Equals, nil)
 	err = s.RunGit(c, spectatorToken, "push", "active/foo.git", "master:newbranchfail")
-	c.Assert(err, check.ErrorMatches, `.*HTTP code = 403.*`)
+	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{})
 }

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


hooks/post-receive
--