X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44e01cf266a3c062b2f0f5bb3426672024367d38..b3f9cef0402c67cf06f825b283d95ef5819ab93f:/services/nodemanager/tests/test_daemon.py diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py index 176b096714..0a63222afc 100644 --- a/services/nodemanager/tests/test_daemon.py +++ b/services/nodemanager/tests/test_daemon.py @@ -30,25 +30,25 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, [54, 5, 1], 8, 600, 3600, self.node_setup, self.node_shutdown, self.node_factory).proxy() if cloud_nodes is not None: - self.daemon.update_cloud_nodes(cloud_nodes) + self.daemon.update_cloud_nodes(cloud_nodes).get(self.TIMEOUT) if arvados_nodes is not None: - self.daemon.update_arvados_nodes(arvados_nodes) + self.daemon.update_arvados_nodes(arvados_nodes).get(self.TIMEOUT) if want_sizes is not None: - self.daemon.update_server_wishlist(want_sizes) + self.daemon.update_server_wishlist(want_sizes).get(self.TIMEOUT) def test_easy_node_creation(self): size = testutil.MockSize(1) self.make_daemon(want_sizes=[size]) - self.wait_for_call(self.node_setup.start) + self.stop_proxy(self.daemon) + self.assertTrue(self.node_setup.start.called) def test_node_pairing(self): cloud_node = testutil.cloud_node_mock(1) arv_node = testutil.arvados_node_mock(1) self.make_daemon([cloud_node], [arv_node]) - self.wait_for_call(self.node_factory.start) - pair_func = self.node_factory.start().proxy().offer_arvados_pair - self.wait_for_call(pair_func) - pair_func.assert_called_with(arv_node) + self.stop_proxy(self.daemon) + self.node_factory.start().proxy().offer_arvados_pair.assert_called_with( + arv_node) def test_node_pairing_after_arvados_update(self): cloud_node = testutil.cloud_node_mock(2) @@ -68,21 +68,25 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, def test_old_arvados_node_not_double_assigned(self): arv_node = testutil.arvados_node_mock(3, age=9000) size = testutil.MockSize(3) - self.make_daemon(arvados_nodes=[arv_node], want_sizes=[size, size]) - node_starter = self.node_setup.start - deadline = time.time() + self.TIMEOUT - while (time.time() < deadline) and (node_starter.call_count < 2): - time.sleep(.1) - self.assertEqual(2, node_starter.call_count) + self.make_daemon(arvados_nodes=[arv_node]) + setup_ref = self.node_setup.start().proxy().actor_ref + setup_ref.actor_urn = 0 + self.node_setup.start.reset_mock() + self.daemon.update_server_wishlist([size]).get(self.TIMEOUT) + self.daemon.max_nodes.get(self.TIMEOUT) + setup_ref.actor_urn += 1 + self.daemon.update_server_wishlist([size, size]).get(self.TIMEOUT) + self.stop_proxy(self.daemon) used_nodes = [call[1].get('arvados_node') - for call in node_starter.call_args_list] + for call in self.node_setup.start.call_args_list] + self.assertEqual(2, len(used_nodes)) self.assertIn(arv_node, used_nodes) self.assertIn(None, used_nodes) def test_node_count_satisfied(self): - self.make_daemon([testutil.cloud_node_mock()]) - self.daemon.update_server_wishlist( - [testutil.MockSize(1)]).get(self.TIMEOUT) + self.make_daemon([testutil.cloud_node_mock()], + want_sizes=[testutil.MockSize(1)]) + self.stop_proxy(self.daemon) self.assertFalse(self.node_setup.called) def test_booting_nodes_counted(self): @@ -90,10 +94,11 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, arv_node = testutil.arvados_node_mock(1) server_wishlist = [testutil.MockSize(1)] * 2 self.make_daemon([cloud_node], [arv_node], server_wishlist) - self.wait_for_call(self.node_setup.start) - self.node_setup.reset_mock() + self.daemon.max_nodes.get(self.TIMEOUT) + self.assertTrue(self.node_setup.start.called) self.daemon.update_server_wishlist(server_wishlist).get(self.TIMEOUT) - self.assertFalse(self.node_setup.called) + self.stop_proxy(self.daemon) + self.assertEqual(1, self.node_setup.start.call_count) def test_no_duplication_when_booting_node_listed_fast(self): # Test that we don't start two ComputeNodeMonitorActors when @@ -101,23 +106,23 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, # get the "node up" message from CloudNodeSetupActor. cloud_node = testutil.cloud_node_mock(1) self.make_daemon(want_sizes=[testutil.MockSize(1)]) - self.wait_for_call(self.node_setup.start) + self.daemon.max_nodes.get(self.TIMEOUT) + self.assertEqual(1, self.node_setup.start.call_count) setup = mock.MagicMock(name='setup_node_mock') setup.actor_ref = self.node_setup.start().proxy().actor_ref setup.cloud_node.get.return_value = cloud_node setup.arvados_node.get.return_value = testutil.arvados_node_mock(1) - self.daemon.update_cloud_nodes([cloud_node]) - self.wait_for_call(self.node_factory.start) - self.node_factory.reset_mock() + self.daemon.update_cloud_nodes([cloud_node]).get(self.TIMEOUT) + self.assertTrue(self.node_factory.start.called) self.daemon.node_up(setup).get(self.TIMEOUT) - self.assertFalse(self.node_factory.start.called) + self.assertEqual(1, self.node_factory.start.call_count) def test_booting_nodes_shut_down(self): self.make_daemon(want_sizes=[testutil.MockSize(1)]) - self.wait_for_call(self.node_setup.start) - self.daemon.update_server_wishlist([]) - self.wait_for_call( - self.node_setup.start().proxy().stop_if_no_cloud_node) + self.daemon.update_server_wishlist([]).get(self.TIMEOUT) + self.stop_proxy(self.daemon) + self.assertTrue( + self.node_setup.start().proxy().stop_if_no_cloud_node.called) def test_shutdown_declined_at_wishlist_capacity(self): cloud_node = testutil.cloud_node_mock(1) @@ -125,34 +130,32 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, self.make_daemon(cloud_nodes=[cloud_node], want_sizes=[size]) node_actor = self.node_factory().proxy() self.daemon.node_can_shutdown(node_actor).get(self.TIMEOUT) + self.stop_proxy(self.daemon) self.assertFalse(node_actor.shutdown.called) def test_shutdown_accepted_below_capacity(self): self.make_daemon(cloud_nodes=[testutil.cloud_node_mock()]) node_actor = self.node_factory().proxy() - self.daemon.node_can_shutdown(node_actor) - self.wait_for_call(self.node_shutdown.start) + self.daemon.node_can_shutdown(node_actor).get(self.TIMEOUT) + self.stop_proxy(self.daemon) + self.assertTrue(self.node_shutdown.start.called) def test_clean_shutdown_waits_for_node_setup_finish(self): self.make_daemon(want_sizes=[testutil.MockSize(1)]) - self.wait_for_call(self.node_setup.start) + self.daemon.max_nodes.get(self.TIMEOUT) + self.assertTrue(self.node_setup.start.called) new_node = self.node_setup.start().proxy() - self.daemon.shutdown() - self.wait_for_call(new_node.stop_if_no_cloud_node) - self.daemon.node_up(new_node) - self.wait_for_call(new_node.stop) + self.daemon.shutdown().get(self.TIMEOUT) + self.assertTrue(new_node.stop_if_no_cloud_node.called) + self.daemon.node_up(new_node).get(self.TIMEOUT) + self.assertTrue(new_node.stop.called) self.assertTrue( self.daemon.actor_ref.actor_stopped.wait(self.TIMEOUT)) def test_wishlist_ignored_after_shutdown(self): size = testutil.MockSize(2) self.make_daemon(want_sizes=[size]) - node_starter = self.node_setup.start - self.wait_for_call(node_starter) - node_starter.reset_mock() - self.daemon.shutdown() - self.daemon.update_server_wishlist([size] * 2).get(self.TIMEOUT) - # Send another message and wait for a response, to make sure all - # internal messages generated by the wishlist update are processed. + self.daemon.shutdown().get(self.TIMEOUT) self.daemon.update_server_wishlist([size] * 2).get(self.TIMEOUT) - self.assertFalse(node_starter.called) + self.stop_proxy(self.daemon) + self.assertEqual(1, self.node_setup.start.call_count)