[ARVADOS] updated: 1fd5716e1714337b6ff96f6725e1f22c7a6ceb65

[Git user]

Summary of changes:
 services/nodemanager/tests/test_failure.py | 3 +++
 1 file changed, 3 insertions(+)

       via  1fd5716e1714337b6ff96f6725e1f22c7a6ceb65 (commit)
       via  cdd5523d12bb8cbd88ea897ac3a50cbc1ec7ffce (commit)
       via  bf3f076d4e1559937dfc4ac27747612df0f8761b (commit)
      from  0934e5663b3e3dc0567ecfc71423d970a313578a (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 1fd5716e1714337b6ff96f6725e1f22c7a6ceb65
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue May 17 11:44:05 2016 -0400

    8236: Add comment to BogusActor.ping()

diff --git a/services/nodemanager/tests/test_failure.py b/services/nodemanager/tests/test_failure.py
index f30ea15..0a121b6 100644
--- a/services/nodemanager/tests/test_failure.py
+++ b/services/nodemanager/tests/test_failure.py
@@ -24,7 +24,10 @@ class BogusActor(arvnodeman.baseactor.BaseNodeManagerActor):
         raise self.exp
 
     def ping(self):
+        # Called by WatchdogActorTest, this delay is longer than the test timeout
+        # of 1 second, which should cause the watchdog ping to fail.
         time.sleep(2)
+        return True
 
 class ActorUnhandledExceptionTest(unittest.TestCase):
     def test_fatal_error(self):

commit cdd5523d12bb8cbd88ea897ac3a50cbc1ec7ffce
Merge: 0934e56 bf3f076
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue May 17 11:16:47 2016 -0400

    Merge branch 'master' into 8236-nodemanager-watchdog


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


hooks/post-receive
--