X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/68c8b2056d6c72f0229cf29f999a8e0a1e4231f9..c4fa80c6ed2445e1e384455944eb6c4108906cad:/services/nodemanager/tests/test_daemon.py

diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index 96fcde9524..bdba83ade1 100644
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -49,8 +49,18 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
     def monitor_list(self):
         return pykka.ActorRegistry.get_by_class(ComputeNodeMonitorActor)
 
+    def monitored_arvados_nodes(self):
+        pairings = []
+        for future in [actor.proxy().arvados_node
+                       for actor in self.monitor_list()]:
+            try:
+                pairings.append(future.get(self.TIMEOUT))
+            except pykka.ActorDeadError:
+                pass
+        return pairings
+
     def alive_monitor_count(self):
-        return sum(1 for actor in self.monitor_list() if actor.is_alive())
+        return len(self.monitored_arvados_nodes())
 
     def assertShutdownCancellable(self, expected=True):
         self.assertTrue(self.node_shutdown.start.called)
@@ -65,9 +75,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
         self.assertTrue(self.node_setup.start.called)
 
     def check_monitors_arvados_nodes(self, *arv_nodes):
-        pairings = [monitor.proxy().arvados_node
-                    for monitor in self.monitor_list() if monitor.is_alive()]
-        self.assertItemsEqual(arv_nodes, pykka.get_all(pairings, self.TIMEOUT))
+        self.assertItemsEqual(arv_nodes, self.monitored_arvados_nodes())
 
     def test_node_pairing(self):
         cloud_node = testutil.cloud_node_mock(1)