openstack/ironic
Code Issues Proposed changes

Enforce autospec in test_base_manager

Browse Source 
And remove corresponding H210 filters.

Change-Id: I252d55a2e51f3a2abbd52b94deeb0ee0f8b1fcbe
This commit is contained in:
Riccardo Pittau 2020-06-10 14:42:20 +02:00
parent 0a7608cee4
commit 429c8013fa
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ironic/tests/unit/conductor/test_base_manager.py
View File

@ -92,7 +92,7 @@ class StartStopTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
res = objects.Conductor.get_by_hostname(self.context, self.hostname) res = objects.Conductor.get_by_hostname(self.context, self.hostname)
self.assertEqual(self.hostname, res['hostname']) self.assertEqual(self.hostname, res['hostname'])
@mock.patch.object(manager.ConductorManager, 'init_host') @mock.patch.object(manager.ConductorManager, 'init_host', autospec=True)
def test_stop_uninitialized_conductor(self, mock_init): def test_stop_uninitialized_conductor(self, mock_init):
self._start_service() self._start_service()
self.service.del_host() self.service.del_host()
@ -107,7 +107,8 @@ class StartStopTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
mock_def_iface.return_value = 'fake' mock_def_iface.return_value = 'fake'
df = driver_factory.HardwareTypesFactory() df = driver_factory.HardwareTypesFactory()
with mock.patch.object(df._extension_manager, 'names') as mock_names: with mock.patch.object(df._extension_manager, 'names',
autospec=True) as mock_names:
# verify driver names are registered # verify driver names are registered
self.config(enabled_hardware_types=init_names) self.config(enabled_hardware_types=init_names)
mock_names.return_value = init_names mock_names.return_value = init_names
@ -180,10 +181,12 @@ class StartStopTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
self.assertTrue(periodics.is_periodic(hw_type.task)) self.assertTrue(periodics.is_periodic(hw_type.task))
self.assertNotIn(hw_type.task, tasks) self.assertNotIn(hw_type.task, tasks)
@mock.patch.object(driver_factory.HardwareTypesFactory, '__init__') @mock.patch.object(driver_factory.HardwareTypesFactory, '__init__',
autospec=True)
def test_start_fails_on_missing_driver(self, mock_df): def test_start_fails_on_missing_driver(self, mock_df):
mock_df.side_effect = exception.DriverNotFound('test') mock_df.side_effect = exception.DriverNotFound('test')
with mock.patch.object(self.dbapi, 'register_conductor') as mock_reg: with mock.patch.object(self.dbapi, 'register_conductor',
autospec=True) as mock_reg:
self.assertRaises(exception.DriverNotFound, self.assertRaises(exception.DriverNotFound,
self.service.init_host) self.service.init_host)
self.assertTrue(mock_df.called) self.assertTrue(mock_df.called)
@ -195,8 +198,8 @@ class StartStopTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
'options enabled_boot_interfaces', 'options enabled_boot_interfaces',
self.service.init_host) self.service.init_host)
@mock.patch.object(base_manager, 'LOG') @mock.patch.object(base_manager, 'LOG', autospec=True)
@mock.patch.object(driver_factory, 'HardwareTypesFactory') @mock.patch.object(driver_factory, 'HardwareTypesFactory', autospec=True)
def test_start_fails_on_hw_types(self, ht_mock, log_mock): def test_start_fails_on_hw_types(self, ht_mock, log_mock):
driver_factory_mock = mock.MagicMock(names=[]) driver_factory_mock = mock.MagicMock(names=[])
ht_mock.return_value = driver_factory_mock ht_mock.return_value = driver_factory_mock
@ -205,16 +208,18 @@ class StartStopTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
self.assertTrue(log_mock.error.called) self.assertTrue(log_mock.error.called)
ht_mock.assert_called_once_with() ht_mock.assert_called_once_with()
@mock.patch.object(base_manager, 'LOG') @mock.patch.object(base_manager, 'LOG', autospec=True)
@mock.patch.object(base_manager.BaseConductorManager, @mock.patch.object(base_manager.BaseConductorManager,
'_register_and_validate_hardware_interfaces') '_register_and_validate_hardware_interfaces',
@mock.patch.object(base_manager.BaseConductorManager, 'del_host') autospec=True)
@mock.patch.object(base_manager.BaseConductorManager, 'del_host',
autospec=True)
def test_start_fails_hw_type_register(self, del_mock, reg_mock, log_mock): def test_start_fails_hw_type_register(self, del_mock, reg_mock, log_mock):
reg_mock.side_effect = exception.DriverNotFound('hw-type') reg_mock.side_effect = exception.DriverNotFound('hw-type')
self.assertRaises(exception.DriverNotFound, self.assertRaises(exception.DriverNotFound,
self.service.init_host) self.service.init_host)
self.assertTrue(log_mock.error.called) self.assertTrue(log_mock.error.called)
del_mock.assert_called_once_with() del_mock.assert_called_once()
def test_prevent_double_start(self): def test_prevent_double_start(self):
self._start_service() self._start_service()
@ -242,13 +247,13 @@ class StartStopTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
self.assertEqual(state[1], node.provision_state, self.assertEqual(state[1], node.provision_state,
'Test failed when recovering from %s' % state[0]) 'Test failed when recovering from %s' % state[0])
@mock.patch.object(base_manager, 'LOG') @mock.patch.object(base_manager, 'LOG', autospec=True)
def test_warning_on_low_workers_pool(self, log_mock): def test_warning_on_low_workers_pool(self, log_mock):
CONF.set_override('workers_pool_size', 3, 'conductor') CONF.set_override('workers_pool_size', 3, 'conductor')
self._start_service() self._start_service()
self.assertTrue(log_mock.warning.called) self.assertTrue(log_mock.warning.called)
@mock.patch.object(eventlet.greenpool.GreenPool, 'waitall') @mock.patch.object(eventlet.greenpool.GreenPool, 'waitall', autospec=True)
def test_del_host_waits_on_workerpool(self, wait_mock): def test_del_host_waits_on_workerpool(self, wait_mock):
self._start_service() self._start_service()
self.service.del_host() self.service.del_host()
@ -311,9 +316,10 @@ class KeepAliveTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
self._start_service() self._start_service()
# avoid wasting time at the event.wait() # avoid wasting time at the event.wait()
CONF.set_override('heartbeat_interval', 0, 'conductor') CONF.set_override('heartbeat_interval', 0, 'conductor')
with mock.patch.object(self.dbapi, 'touch_conductor') as mock_touch: with mock.patch.object(self.dbapi, 'touch_conductor',
autospec=True) as mock_touch:
with mock.patch.object(self.service._keepalive_evt, with mock.patch.object(self.service._keepalive_evt,
'is_set') as mock_is_set: 'is_set', autospec=True) as mock_is_set:
mock_is_set.side_effect = [False, True] mock_is_set.side_effect = [False, True]
self.service._conductor_service_record_keepalive() self.service._conductor_service_record_keepalive()
mock_touch.assert_called_once_with(self.hostname) mock_touch.assert_called_once_with(self.hostname)
@ -322,11 +328,12 @@ class KeepAliveTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
self._start_service() self._start_service()
# avoid wasting time at the event.wait() # avoid wasting time at the event.wait()
CONF.set_override('heartbeat_interval', 0, 'conductor') CONF.set_override('heartbeat_interval', 0, 'conductor')
with mock.patch.object(self.dbapi, 'touch_conductor') as mock_touch: with mock.patch.object(self.dbapi, 'touch_conductor',
autospec=True) as mock_touch:
mock_touch.side_effect = [None, db_exception.DBConnectionError(), mock_touch.side_effect = [None, db_exception.DBConnectionError(),
None] None]
with mock.patch.object(self.service._keepalive_evt, with mock.patch.object(self.service._keepalive_evt,
'is_set') as mock_is_set: 'is_set', autospec=True) as mock_is_set:
mock_is_set.side_effect = [False, False, False, True] mock_is_set.side_effect = [False, False, False, True]
self.service._conductor_service_record_keepalive() self.service._conductor_service_record_keepalive()
self.assertEqual(3, mock_touch.call_count) self.assertEqual(3, mock_touch.call_count)
@ -335,11 +342,12 @@ class KeepAliveTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
self._start_service() self._start_service()
# avoid wasting time at the event.wait() # avoid wasting time at the event.wait()
CONF.set_override('heartbeat_interval', 0, 'conductor') CONF.set_override('heartbeat_interval', 0, 'conductor')
with mock.patch.object(self.dbapi, 'touch_conductor') as mock_touch: with mock.patch.object(self.dbapi, 'touch_conductor',
autospec=True) as mock_touch:
mock_touch.side_effect = [None, Exception(), mock_touch.side_effect = [None, Exception(),
None] None]
with mock.patch.object(self.service._keepalive_evt, with mock.patch.object(self.service._keepalive_evt,
'is_set') as mock_is_set: 'is_set', autospec=True) as mock_is_set:
mock_is_set.side_effect = [False, False, False, True] mock_is_set.side_effect = [False, False, False, True]
self.service._conductor_service_record_keepalive() self.service._conductor_service_record_keepalive()
self.assertEqual(3, mock_touch.call_count) self.assertEqual(3, mock_touch.call_count)
@ -447,7 +455,8 @@ class RegisterInterfacesTestCase(mgr_utils.ServiceSetUpMixin,
@mock.patch.object(fake.FakeConsole, 'start_console', autospec=True) @mock.patch.object(fake.FakeConsole, 'start_console', autospec=True)
@mock.patch.object(notification_utils, 'emit_console_notification') @mock.patch.object(notification_utils, 'emit_console_notification',
autospec=True)
class StartConsolesTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase): class StartConsolesTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
def test__start_consoles(self, mock_notify, mock_start_console): def test__start_consoles(self, mock_notify, mock_start_console):
obj_utils.create_test_node(self.context, obj_utils.create_test_node(self.context,
@ -500,7 +509,7 @@ class StartConsolesTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
mock.call(mock.ANY, 'console_restore', mock.call(mock.ANY, 'console_restore',
fields.NotificationStatus.ERROR)]) fields.NotificationStatus.ERROR)])
@mock.patch.object(base_manager, 'LOG') @mock.patch.object(base_manager, 'LOG', autospec=True)
def test__start_consoles_node_locked(self, log_mock, mock_notify, def test__start_consoles_node_locked(self, log_mock, mock_notify,
mock_start_console): mock_start_console):
test_node = obj_utils.create_test_node(self.context, test_node = obj_utils.create_test_node(self.context,
@ -516,14 +525,15 @@ class StartConsolesTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
self.assertTrue(log_mock.warning.called) self.assertTrue(log_mock.warning.called)
self.assertFalse(mock_notify.called) self.assertFalse(mock_notify.called)
@mock.patch.object(base_manager, 'LOG') @mock.patch.object(base_manager, 'LOG', autospec=True)
def test__start_consoles_node_not_found(self, log_mock, mock_notify, def test__start_consoles_node_not_found(self, log_mock, mock_notify,
mock_start_console): mock_start_console):
test_node = obj_utils.create_test_node(self.context, test_node = obj_utils.create_test_node(self.context,
driver='fake-hardware', driver='fake-hardware',
console_enabled=True) console_enabled=True)
self._start_service() self._start_service()
with mock.patch.object(task_manager, 'acquire') as mock_acquire: with mock.patch.object(task_manager, 'acquire',
autospec=True) as mock_acquire:
mock_acquire.side_effect = exception.NodeNotFound(node='not found') mock_acquire.side_effect = exception.NodeNotFound(node='not found')
self.service._start_consoles(self.context) self.service._start_consoles(self.context)
self.assertFalse(mock_start_console.called) self.assertFalse(mock_start_console.called)

1
tox.ini
View File

@ -131,7 +131,6 @@ per-file-ignores =
ironic/cmd/__init__.py:E402 ironic/cmd/__init__.py:E402
ironic/tests/base.py:E402 ironic/tests/base.py:E402
ironic/tests/unit/api/*:H210 ironic/tests/unit/api/*:H210
ironic/tests/unit/conductor/test_base_manager.py:H210
ironic/tests/unit/conductor/test_utils.py:H210 ironic/tests/unit/conductor/test_utils.py:H210
ironic/tests/unit/conductor/test_manager.py:H210 ironic/tests/unit/conductor/test_manager.py:H210
ironic/tests/unit/conductor/test_deployments.py:H210 ironic/tests/unit/conductor/test_deployments.py:H210