[ARVADOS] updated: 97ca7222ef893c4914d6425479f05fe32b9df8eb

git at public.curoverse.com git at public.curoverse.com
Thu Apr 23 10:08:18 EDT 2015


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

       via  97ca7222ef893c4914d6425479f05fe32b9df8eb (commit)
      from  1765cd327b15151c113890860dd8818c6fc44962 (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 97ca7222ef893c4914d6425479f05fe32b9df8eb
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Apr 23 10:00:54 2015 -0400

    5416: Test with HEAD in current tree, not master: jenkins index has no master.
    
    Improve logging in test suite.
    
    refs #5416

diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index d773dd9..ca5c5f4 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -148,9 +148,11 @@ func (s *IntegrationSuite) runGit(c *check.C, token, gitCmd, repo string, args .
 
 // Make a bare arvados repo at {tmpRepoRoot}/arvados.git
 func (s *IntegrationSuite) makeArvadosRepo(c *check.C) {
-	_, err := exec.Command("git", "init", "--bare", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git").Output()
+	msg, err := exec.Command("git", "init", "--bare", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git").CombinedOutput()
+	c.Log(msg)
 	c.Assert(err, check.Equals, nil)
-	_, err = exec.Command("git", "--git-dir", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git", "fetch", "../../.git", "master:master").Output()
+	msg, err = exec.Command("git", "--git-dir", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git", "fetch", "../../.git", "HEAD:master").CombinedOutput()
+	c.Log(msg)
 	c.Assert(err, check.Equals, nil)
 }
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list