[ARVADOS] created: 6ab9f3292ddb980192e3af1090147c32af098d95

git at public.curoverse.com git at public.curoverse.com
Wed Apr 8 12:01:47 EDT 2015


        at  6ab9f3292ddb980192e3af1090147c32af098d95 (commit)


commit 6ab9f3292ddb980192e3af1090147c32af098d95
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Apr 8 12:03:44 2015 -0400

    5416: Do not blow up tests when git global config is uninitialized.

diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index 5796445..e7dd8fe 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -83,11 +83,11 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
 	c.Assert(err, check.Equals, nil)
 	_, err = exec.Command("git", "init", s.tmpRepoRoot+"/zzzzz-s0uqq-382brsig8rp3666").Output()
 	c.Assert(err, check.Equals, nil)
-	_, err = exec.Command("sh", "-c", "cd "+s.tmpRepoRoot+"/zzzzz-s0uqq-382brsig8rp3666 && echo test >test && git add test && git commit -am 'foo: test'").CombinedOutput()
+	_, err = exec.Command("sh", "-c", "cd "+s.tmpRepoRoot+"/zzzzz-s0uqq-382brsig8rp3666 && echo test >test && git add test && git -c user.name=Foo -c user.email=Foo commit -am 'foo: test'").CombinedOutput()
 	c.Assert(err, check.Equals, nil)
 	_, err = exec.Command("git", "init", s.tmpWorkdir).Output()
 	c.Assert(err, check.Equals, nil)
-	_, err = exec.Command("sh", "-c", "cd "+s.tmpWorkdir+" && echo work >work && git add work && git commit -am 'workdir: test'").CombinedOutput()
+	_, err = exec.Command("sh", "-c", "cd "+s.tmpWorkdir+" && echo work >work && git add work && git -c user.name=Foo -c user.email=Foo commit -am 'workdir: test'").CombinedOutput()
 	c.Assert(err, check.Equals, nil)
 
 	theConfig = &config{

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list