[ARVADOS] created: 71419a78c309d9128d88e25ed517916945e377fd

[Git user]

        at  71419a78c309d9128d88e25ed517916945e377fd (commit)


commit 71419a78c309d9128d88e25ed517916945e377fd
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jul 10 14:31:34 2017 -0400

    11950: Fix nodemanager watchdog test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/services/nodemanager/tests/test_failure.py b/services/nodemanager/tests/test_failure.py
index cfac61b..e796ff8 100644
--- a/services/nodemanager/tests/test_failure.py
+++ b/services/nodemanager/tests/test_failure.py
@@ -24,7 +24,10 @@ class BogusActor(arvnodeman.baseactor.BaseNodeManagerActor):
         self.exp = e
 
     def doStuff(self):
-        raise self.exp
+        if self.exp:
+            raise self.exp
+        while True:
+            time.sleep(1)
 
     def ping(self):
         # Called by WatchdogActorTest, this delay is longer than the test timeout
@@ -51,8 +54,8 @@ class ActorUnhandledExceptionTest(testutil.ActorTestMixin, unittest.TestCase):
 class WatchdogActorTest(testutil.ActorTestMixin, unittest.TestCase):
     @mock.patch('os.kill')
     def test_time_timout(self, kill_mock):
-        act = BogusActor.start(OSError(errno.ENOENT, ""))
+        act = BogusActor.start(None)
         watch = arvnodeman.baseactor.WatchdogActor.start(1, act)
         watch.stop(block=True)
         act.stop(block=True)
-        self.assertTrue(kill_mock.called)
+        kill_mock.assert_called()

commit 5e6f21c38fafea8520479a5f5961259828924878
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
--