Enforce autospec in drac tests

And remove corresponding H210 filters.

Change-Id: I32ea1e436a9650b7a70ad876337c4a53e4094d46
This commit is contained in:
Riccardo Pittau 2020-05-29 10:29:55 +02:00
parent dac810aaf4
commit bffde661ef
4 changed files with 25 additions and 18 deletions

View File

@ -448,8 +448,8 @@ class DracManagementInternalMethodsTestCase(test_utils.BaseDracTest):
self.assertEqual(0, mock_client.set_bios_settings.call_count)
self.assertEqual(0, mock_client.commit_pending_bios_changes.call_count)
@mock.patch('time.time')
@mock.patch('time.sleep')
@mock.patch('time.time', autospec=True)
@mock.patch('time.sleep', autospec=True)
@mock.patch.object(drac_mgmt, '_get_next_persistent_boot_mode',
spec_set=True, autospec=True)
@mock.patch.object(drac_mgmt, '_get_boot_device', spec_set=True,

View File

@ -187,7 +187,8 @@ class DracPeriodicTaskTestCase(db_base.DbTestCase):
self.node.raid_config['logical_disks'])
mock_notify_conductor_resume.assert_called_once_with(task)
@mock.patch.object(manager_utils, 'notify_conductor_resume_clean')
@mock.patch.object(manager_utils, 'notify_conductor_resume_clean',
autospec=True)
def test__check_node_raid_jobs_with_completed_job_in_clean(
self, mock_notify_conductor_resume):
self.node.clean_step = {'foo': 'bar'}
@ -195,7 +196,8 @@ class DracPeriodicTaskTestCase(db_base.DbTestCase):
self._test__check_node_raid_jobs_with_completed_job(
mock_notify_conductor_resume)
@mock.patch.object(manager_utils, 'notify_conductor_resume_deploy')
@mock.patch.object(manager_utils, 'notify_conductor_resume_deploy',
autospec=True)
def test__check_node_raid_jobs_with_completed_job_in_deploy(
self, mock_notify_conductor_resume):
self._test__check_node_raid_jobs_with_completed_job(
@ -272,7 +274,8 @@ class DracPeriodicTaskTestCase(db_base.DbTestCase):
task.process_event.assert_called_once_with('fail')
self.assertFalse(mock_notify_conductor_resume.called)
@mock.patch.object(manager_utils, 'notify_conductor_resume_clean')
@mock.patch.object(manager_utils, 'notify_conductor_resume_clean',
autospec=True)
def test__check_node_raid_jobs_with_completed_job_already_failed_in_clean(
self, mock_notify_conductor_resume):
self.node.clean_step = {'foo': 'bar'}
@ -280,7 +283,8 @@ class DracPeriodicTaskTestCase(db_base.DbTestCase):
self._test__check_node_raid_jobs_with_completed_job_already_failed(
mock_notify_conductor_resume)
@mock.patch.object(manager_utils, 'notify_conductor_resume_deploy')
@mock.patch.object(manager_utils, 'notify_conductor_resume_deploy',
autospec=True)
def test__check_node_raid_jobs_with_completed_job_already_failed_in_deploy(
self, mock_notify_conductor_resume):
self._test__check_node_raid_jobs_with_completed_job_already_failed(
@ -326,7 +330,8 @@ class DracPeriodicTaskTestCase(db_base.DbTestCase):
self.node.raid_config['logical_disks'])
mock_notify_conductor_resume.assert_called_once_with(task)
@mock.patch.object(manager_utils, 'notify_conductor_resume_clean')
@mock.patch.object(manager_utils, 'notify_conductor_resume_clean',
autospec=True)
def test__check_node_raid_jobs_with_multiple_jobs_completed_in_clean(
self, mock_notify_conductor_resume):
self.node.clean_step = {'foo': 'bar'}
@ -334,7 +339,8 @@ class DracPeriodicTaskTestCase(db_base.DbTestCase):
self._test__check_node_raid_jobs_with_multiple_jobs_completed(
mock_notify_conductor_resume)
@mock.patch.object(manager_utils, 'notify_conductor_resume_deploy')
@mock.patch.object(manager_utils, 'notify_conductor_resume_deploy',
autospec=True)
def test__check_node_raid_jobs_with_multiple_jobs_completed_in_deploy(
self, mock_notify_conductor_resume):
self._test__check_node_raid_jobs_with_multiple_jobs_completed(
@ -384,7 +390,8 @@ class DracPeriodicTaskTestCase(db_base.DbTestCase):
task.process_event.assert_called_once_with('fail')
self.assertFalse(mock_notify_conductor_resume.called)
@mock.patch.object(manager_utils, 'notify_conductor_resume_clean')
@mock.patch.object(manager_utils, 'notify_conductor_resume_clean',
autospec=True)
def test__check_node_raid_jobs_with_multiple_jobs_failed_in_clean(
self, mock_notify_conductor_resume):
self.node.clean_step = {'foo': 'bar'}
@ -392,7 +399,8 @@ class DracPeriodicTaskTestCase(db_base.DbTestCase):
self._test__check_node_raid_jobs_with_multiple_jobs_failed(
mock_notify_conductor_resume)
@mock.patch.object(manager_utils, 'notify_conductor_resume_deploy')
@mock.patch.object(manager_utils, 'notify_conductor_resume_deploy',
autospec=True)
def test__check_node_raid_jobs_with_multiple_jobs_failed_in_deploy(
self, mock_notify_conductor_resume):
self._test__check_node_raid_jobs_with_multiple_jobs_failed(

View File

@ -69,7 +69,7 @@ class DracPowerTestCase(test_utils.BaseDracTest):
mock_client.get_power_state.assert_called_once_with()
@mock.patch.object(drac_power.LOG, 'warning')
@mock.patch.object(drac_power.LOG, 'warning', autospec=True)
def test_set_power_state(self, mock_log, mock_get_drac_client):
mock_client = mock_get_drac_client.return_value
@ -95,7 +95,7 @@ class DracPowerTestCase(test_utils.BaseDracTest):
drac_power_state = drac_power.REVERSE_POWER_STATES[states.POWER_OFF]
mock_client.set_power_state.assert_called_once_with(drac_power_state)
@mock.patch.object(drac_power.LOG, 'warning')
@mock.patch.object(drac_power.LOG, 'warning', autospec=True)
def test_set_power_state_timeout(self, mock_log, mock_get_drac_client):
mock_client = mock_get_drac_client.return_value
@ -108,7 +108,7 @@ class DracPowerTestCase(test_utils.BaseDracTest):
mock_client.set_power_state.assert_called_once_with(drac_power_state)
self.assertTrue(mock_log.called)
@mock.patch.object(drac_power.LOG, 'warning')
@mock.patch.object(drac_power.LOG, 'warning', autospec=True)
def test_reboot_while_powered_on(self, mock_log, mock_get_drac_client):
mock_client = mock_get_drac_client.return_value
mock_client.get_power_state.return_value = drac_constants.POWER_ON
@ -121,7 +121,7 @@ class DracPowerTestCase(test_utils.BaseDracTest):
mock_client.set_power_state.assert_called_once_with(drac_power_state)
self.assertFalse(mock_log.called)
@mock.patch.object(drac_power.LOG, 'warning')
@mock.patch.object(drac_power.LOG, 'warning', autospec=True)
def test_reboot_while_powered_on_timeout(self, mock_log,
mock_get_drac_client):
mock_client = mock_get_drac_client.return_value
@ -146,7 +146,7 @@ class DracPowerTestCase(test_utils.BaseDracTest):
drac_power_state = drac_power.REVERSE_POWER_STATES[states.POWER_ON]
mock_client.set_power_state.assert_called_once_with(drac_power_state)
@mock.patch('time.sleep')
@mock.patch('time.sleep', autospec=True)
def test_reboot_retries_success(self, mock_sleep, mock_get_drac_client):
mock_client = mock_get_drac_client.return_value
mock_client.get_power_state.return_value = drac_constants.POWER_OFF
@ -164,7 +164,7 @@ class DracPowerTestCase(test_utils.BaseDracTest):
[mock.call(drac_power_state),
mock.call(drac_power_state)])
@mock.patch('time.sleep')
@mock.patch('time.sleep', autospec=True)
def test_reboot_retries_fail(self, mock_sleep, mock_get_drac_client):
mock_client = mock_get_drac_client.return_value
mock_client.get_power_state.return_value = drac_constants.POWER_OFF
@ -180,7 +180,7 @@ class DracPowerTestCase(test_utils.BaseDracTest):
self.assertEqual(drac_power.POWER_STATE_TRIES,
mock_client.set_power_state.call_count)
@mock.patch('time.sleep')
@mock.patch('time.sleep', autospec=True)
def test_reboot_retries_power_change_success(self, mock_sleep,
mock_get_drac_client):
mock_client = mock_get_drac_client.return_value

View File

@ -146,7 +146,6 @@ per-file-ignores =
ironic/tests/unit/drivers/modules/irmc/*:H210
ironic/tests/unit/drivers/modules/xclarity/*:H210
ironic/tests/unit/drivers/modules/ansible/*:H210
ironic/tests/unit/drivers/modules/drac/*:H210
ironic/tests/unit/drivers/modules/storage/*:H210
[hacking]