[ARVADOS] updated: 250ae26f6f006f973f62e8d35a6a34e3b0e9f21d

[git at public.curoverse.com]

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

       via  250ae26f6f006f973f62e8d35a6a34e3b0e9f21d (commit)
      from  70ffabfafec877a79cfd4ab5e4fb5831e37068fa (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 250ae26f6f006f973f62e8d35a6a34e3b0e9f21d
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Dec 18 10:42:56 2014 -0500

    4818: Add missing timeout in Node Manager test.
    
    Refs #4818.

diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index 8245fe2..ccd71d5 100644
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -57,9 +57,9 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
         self.assertTrue(self.node_setup.start.called)
 
     def check_monitors_arvados_nodes(self, *arv_nodes):
-        self.assertItemsEqual(arv_nodes, pykka.get_all(
-                monitor.proxy().arvados_node
-                for monitor in self.monitor_list() if monitor.is_alive()))
+        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))
 
     def test_node_pairing(self):
         cloud_node = testutil.cloud_node_mock(1)

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


hooks/post-receive
--