From 359d6bca92b4a5f6f0d843ee73f39ba2fbb20fb7 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Tue, 7 Jul 2020 15:45:15 +0200 Subject: [PATCH] Enforce autospec in test_task_manager And remove corresponding filter from tox.ini Change-Id: I226e329151e0f71e793ade432c80a1628aa21511 --- .../tests/unit/conductor/test_task_manager.py | 18 +++++++++--------- tox.ini | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ironic/tests/unit/conductor/test_task_manager.py b/ironic/tests/unit/conductor/test_task_manager.py index d0c547f406..8a57d7deaa 100644 --- a/ironic/tests/unit/conductor/test_task_manager.py +++ b/ironic/tests/unit/conductor/test_task_manager.py @@ -35,14 +35,14 @@ from ironic.tests.unit.db import base as db_base from ironic.tests.unit.objects import utils as obj_utils -@mock.patch.object(objects.Node, 'get') -@mock.patch.object(objects.Node, 'release') -@mock.patch.object(objects.Node, 'reserve') -@mock.patch.object(driver_factory, 'build_driver_for_task') -@mock.patch.object(objects.Port, 'list_by_node_id') -@mock.patch.object(objects.Portgroup, 'list_by_node_id') -@mock.patch.object(objects.VolumeConnector, 'list_by_node_id') -@mock.patch.object(objects.VolumeTarget, 'list_by_node_id') +@mock.patch.object(objects.Node, 'get', autospec=True) +@mock.patch.object(objects.Node, 'release', autospec=True) +@mock.patch.object(objects.Node, 'reserve', autospec=True) +@mock.patch.object(driver_factory, 'build_driver_for_task', autospec=True) +@mock.patch.object(objects.Port, 'list_by_node_id', autospec=True) +@mock.patch.object(objects.Portgroup, 'list_by_node_id', autospec=True) +@mock.patch.object(objects.VolumeConnector, 'list_by_node_id', autospec=True) +@mock.patch.object(objects.VolumeTarget, 'list_by_node_id', autospec=True) class TaskManagerTestCase(db_base.DbTestCase): def setUp(self): super(TaskManagerTestCase, self).setUp() @@ -673,7 +673,7 @@ class TaskManagerTestCase(db_base.DbTestCase): on_error_handler.assert_called_once_with(expected_exception, 'fake-argument') - @mock.patch.object(states.machine, 'copy') + @mock.patch.object(states.machine, 'copy', autospec=True) def test_init_prepares_fsm( self, copy_mock, get_volconn_mock, get_voltgt_mock, get_portgroups_mock, get_ports_mock, diff --git a/tox.ini b/tox.ini index 1c2aefc6fd..25557c420b 100644 --- a/tox.ini +++ b/tox.ini @@ -132,7 +132,6 @@ per-file-ignores = ironic/tests/base.py:E402 ironic/tests/unit/api/*:H210 ironic/tests/unit/conductor/test_deployments.py:H210 - ironic/tests/unit/conductor/test_task_manager.py:H210 ironic/tests/unit/conductor/test_notification_utils.py:H210 ironic/tests/unit/common/*:H210 ironic/tests/unit/drivers/modules/test_console_utils.py:H210