[ARVADOS] updated: 1b5e3f43b38995b57a9e36d91cef5b443eef9f6c

[git at public.curoverse.com]

Summary of changes:
 services/nodemanager/tests/test_clientactor.py | 6 +++---
 services/nodemanager/tests/test_computenode.py | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  1b5e3f43b38995b57a9e36d91cef5b443eef9f6c (commit)
      from  1d752f399aa49a271e3e50e7c73921eee0830f06 (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 1b5e3f43b38995b57a9e36d91cef5b443eef9f6c
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Oct 13 15:31:40 2014 -0400

    4139: Fixup small scheduling bugs in Node Manager tests.

diff --git a/services/nodemanager/tests/test_clientactor.py b/services/nodemanager/tests/test_clientactor.py
index e3309dc..1e4c40e 100644
--- a/services/nodemanager/tests/test_clientactor.py
+++ b/services/nodemanager/tests/test_clientactor.py
@@ -46,10 +46,10 @@ class RemotePollLoopActorTestCase(testutil.RemotePollLoopActorTestMixin,
                          "poll loop notified subscribers after error")
 
     def test_late_subscribers_get_responses(self):
-        self.build_monitor(['late_test'])
-        self.monitor.subscribe(lambda response: None)
+        self.build_monitor(['pre_late_test', 'late_test'])
+        self.monitor.subscribe(lambda response: None).get(self.TIMEOUT)
         self.monitor.subscribe(self.subscriber)
-        self.monitor.poll().get()
+        self.monitor.poll().get(self.TIMEOUT)
         self.stop_proxy(self.monitor)
         self.subscriber.assert_called_with('late_test')
 
diff --git a/services/nodemanager/tests/test_computenode.py b/services/nodemanager/tests/test_computenode.py
index 8b7d566..477e20e 100644
--- a/services/nodemanager/tests/test_computenode.py
+++ b/services/nodemanager/tests/test_computenode.py
@@ -211,6 +211,7 @@ class ComputeNodeMonitorActorTestCase(testutil.ActorTestMixin,
         self.shutdowns._set_state(window_open, next_window)
         self.timer.schedule.reset_mock()
         self.node_actor.consider_shutdown().get(self.TIMEOUT)
+        self.stop_proxy(self.node_actor)
         self.assertTrue(self.timer.schedule.called)
         if schedule_time is not None:
             self.assertEqual(schedule_time, self.timer.schedule.call_args[0][0])

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


hooks/post-receive
--