[ARVADOS] updated: d0f91b34eedec9af266ec4877a3005dd627ad38e

[git at public.curoverse.com]

Summary of changes:
 services/arv-git-httpd/git_handler_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

       via  d0f91b34eedec9af266ec4877a3005dd627ad38e (commit)
       via  5b743caf9a5913c62ec1f525f4e95d1c31f76233 (commit)
       via  1c4ba204361de15430236b84b10c9ac5c68665ae (commit)
      from  6e0145efb9929b5a854fb3461161460b0ac75fba (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 d0f91b34eedec9af266ec4877a3005dd627ad38e
Merge: 6e0145e 5b743ca
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Oct 26 14:46:57 2015 -0400

    Merge branch 'pr/25'
    
    Closes #7307.


commit 5b743caf9a5913c62ec1f525f4e95d1c31f76233
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Oct 26 14:24:51 2015 -0400

    7307: Clarify intended failure in arv-git-httpd SplitHostPort test.

diff --git a/services/arv-git-httpd/git_handler_test.go b/services/arv-git-httpd/git_handler_test.go
index 6a4b46f..35c2f48 100644
--- a/services/arv-git-httpd/git_handler_test.go
+++ b/services/arv-git-httpd/git_handler_test.go
@@ -40,15 +40,14 @@ func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
 	c.Check(body, check.Matches, `(?ms).*^SERVER_ADDR=`+regexp.QuoteMeta(theConfig.Addr)+`$.*`)
 }
 
-func (s *GitHandlerSuite) TestCGIError(c *check.C) {
-	log.Printf("git_handler_test: TestCGIError() - expecting a SplitHostPort error, so it is safe to ignore!")
+func (s *GitHandlerSuite) TestCGIErrorOnSplitHostPortError(c *check.C) {
 	u, err := url.Parse("git.zzzzz.arvadosapi.com/test")
 	c.Check(err, check.Equals, nil)
 	resp := httptest.NewRecorder()
 	req := &http.Request{
 		Method:     "GET",
 		URL:        u,
-		RemoteAddr: "bogus", // intentionally invalid (will trigger SplitHostPort error below)
+		RemoteAddr: "test.bad.address.missing.port",
 	}
 	h := newGitHandler()
 	h.ServeHTTP(resp, req)

commit 1c4ba204361de15430236b84b10c9ac5c68665ae
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date:   Fri Sep 11 12:46:16 2015 +0000

    7307: Fixes mocked up CGI output and adds comment regarding SplitHostPort error

diff --git a/services/arv-git-httpd/git_handler_test.go b/services/arv-git-httpd/git_handler_test.go
index b3e49c5..6a4b46f 100644
--- a/services/arv-git-httpd/git_handler_test.go
+++ b/services/arv-git-httpd/git_handler_test.go
@@ -25,7 +25,7 @@ func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
 	}
 	h := newGitHandler()
 	h.(*gitHandler).Path = "/bin/sh"
-	h.(*gitHandler).Args = []string{"-c", "echo HTTP/1.1 200 OK; echo Content-Type: text/plain; echo; env"}
+	h.(*gitHandler).Args = []string{"-c", "printf 'Content-Type: text/plain\r\n\r\n'; env"}
 	os.Setenv("GITOLITE_HTTP_HOME", "/test/ghh")
 	os.Setenv("GL_BYPASS_ACCESS_CHECKS", "yesplease")
 
@@ -41,13 +41,14 @@ func (s *GitHandlerSuite) TestEnvVars(c *check.C) {
 }
 
 func (s *GitHandlerSuite) TestCGIError(c *check.C) {
+	log.Printf("git_handler_test: TestCGIError() - expecting a SplitHostPort error, so it is safe to ignore!")
 	u, err := url.Parse("git.zzzzz.arvadosapi.com/test")
 	c.Check(err, check.Equals, nil)
 	resp := httptest.NewRecorder()
 	req := &http.Request{
 		Method:     "GET",
 		URL:        u,
-		RemoteAddr: "bogus",
+		RemoteAddr: "bogus", // intentionally invalid (will trigger SplitHostPort error below)
 	}
 	h := newGitHandler()
 	h.ServeHTTP(resp, req)

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


hooks/post-receive
--