From 9476cd9a498f75ddba060f96845aa33ea066614c Mon Sep 17 00:00:00 2001 From: Josh Gachnang Date: Tue, 24 Feb 2015 09:53:56 -0800 Subject: [PATCH] Missing mock causing long tests The test wasn't mocking a call to change the power state of the fake node, which was causing this test to account for 14 of 17 seconds on my machine. Change-Id: I8fe77ded3365375f569574c24430027053ef0dd3 --- ironic/tests/drivers/ilo/test_deploy.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ironic/tests/drivers/ilo/test_deploy.py b/ironic/tests/drivers/ilo/test_deploy.py index 30214829a0..171cf797b5 100644 --- a/ironic/tests/drivers/ilo/test_deploy.py +++ b/ironic/tests/drivers/ilo/test_deploy.py @@ -423,11 +423,12 @@ class VendorPassthruTestCase(db_base.DbTestCase): self.assertEqual(states.ACTIVE, task.node.target_provision_state) continue_deploy_mock.assert_called_once_with(task, **kwargs) + @mock.patch.object(manager_utils, 'node_power_action') @mock.patch.object(iscsi_deploy, 'continue_deploy') @mock.patch.object(ilo_common, 'cleanup_vmedia_boot') @mock.patch.object(ilo_deploy, '_get_boot_iso') def test__continue_deploy_create_boot_iso_fail(self, get_iso_mock, - cleanup_vmedia_boot_mock, continue_deploy_mock): + cleanup_vmedia_boot_mock, continue_deploy_mock, node_power_mock): kwargs = {'address': '123456'} continue_deploy_mock.return_value = 'root-uuid' get_iso_mock.side_effect = exception.ImageCreationFailed( @@ -443,6 +444,7 @@ class VendorPassthruTestCase(db_base.DbTestCase): cleanup_vmedia_boot_mock.assert_called_once_with(task) continue_deploy_mock.assert_called_once_with(task, **kwargs) get_iso_mock.assert_called_once_with(task, 'root-uuid') + node_power_mock.assert_called_once_with(task, states.POWER_OFF) self.assertEqual(states.DEPLOYFAIL, task.node.provision_state) self.assertEqual(states.ACTIVE, task.node.target_provision_state) self.assertIsNotNone(task.node.last_error)