openstack/ironic
Code Issues Proposed changes

Missing mock causing long tests

Browse Source 
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
This commit is contained in:
Josh Gachnang 2015-02-24 09:53:56 -08:00
parent d6c2e66973
commit 9476cd9a49
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/tests/drivers/ilo/test_deploy.py
View File

@ -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)