[ARVADOS] updated: 9ee4a125d1796dd7b71ef1b9f255133e5cf0becc

[git at public.curoverse.com]

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

       via  9ee4a125d1796dd7b71ef1b9f255133e5cf0becc (commit)
      from  5560cdf37024ba98bb0367a65bc2176c1577496b (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 9ee4a125d1796dd7b71ef1b9f255133e5cf0becc
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Oct 29 14:22:16 2014 -0400

    Fix race condition in Node Manager shutdown tests.
    
    ComputeNodeMonitorActor considers a shutdown when it's initialized.
    Blocking on the subscription we send ensures that message is fully
    processed before the tests continue.  This is important because
    several of them change the shutdown state immediately after, and that
    might be seen by the internal shutdown consideration without this.
    
    No issue #, but see
    <https://ci.curoverse.com/job/arvados-api-server/1027/console>.

diff --git a/services/nodemanager/tests/test_computenode.py b/services/nodemanager/tests/test_computenode.py
index 57a86fd..a1257b4 100644
--- a/services/nodemanager/tests/test_computenode.py
+++ b/services/nodemanager/tests/test_computenode.py
@@ -186,7 +186,8 @@ class ComputeNodeMonitorActorTestCase(testutil.ActorTestMixin,
         self.node_actor = cnode.ComputeNodeMonitorActor.start(
             self.cloud_mock, start_time, self.shutdowns, self.timer,
             self.updates, arv_node).proxy()
-        self.subscription = self.node_actor.subscribe(self.subscriber)
+        self.subscription = self.node_actor.subscribe(self.subscriber).get(
+            self.TIMEOUT)
 
     def test_init_shutdown_scheduling(self):
         self.make_actor()

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


hooks/post-receive
--