summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-07-08 13:00:50 +0000
committerGerrit Code Review <review@openstack.org>2020-07-08 13:00:50 +0000
commit3fab17f966c4d9e7c019b12cd749fa8218ca4ac4 (patch)
tree49bdd77ff091ff1c338c47161b34515c29a9e6b6
parentc813bf84348f1ebc43a91b10955c56fe0770fff1 (diff)
parent359d6bca92b4a5f6f0d843ee73f39ba2fbb20fb7 (diff)
downloadironic-3fab17f966c4d9e7c019b12cd749fa8218ca4ac4.tar.gz
Merge "Enforce autospec in test_task_manager"15.1.0
-rw-r--r--ironic/tests/unit/conductor/test_task_manager.py18
-rw-r--r--tox.ini1
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 d0c547f40..8a57d7dea 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 1c2aefc6f..25557c420 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