[ARVADOS] updated: 58ead50fe4b7014562c0697290cf933a956ab852

[git at public.curoverse.com]

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

       via  58ead50fe4b7014562c0697290cf933a956ab852 (commit)
      from  5870334b03237f04df6de35193f78b838f7ac7dc (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 58ead50fe4b7014562c0697290cf933a956ab852
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Oct 22 14:28:45 2014 -0400

    4139: Fix race condition in Node Manager tests.
    
    Get a reference to the monitor mock earlier, before the daemon starts
    working with it.  Otherwise, we might get inconsistent state results.
    
    Refs #4139.

diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index a9ebf42..eb625be 100644
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -167,10 +167,10 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
     def test_booted_node_lifecycle(self):
         cloud_node = testutil.cloud_node_mock(6)
         setup = self.start_node_boot(cloud_node, id_num=6)
-        self.daemon.node_up(setup)
-        self.daemon.update_server_wishlist([])
         monitor = self.node_factory.start().proxy()
         monitor.cloud_node.get.return_value = cloud_node
+        self.daemon.node_up(setup)
+        self.daemon.update_server_wishlist([])
         self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT)
         self.assertTrue(self.node_shutdown.start.called,
                         "daemon did not shut down booted node on offer")

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


hooks/post-receive
--