summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-07-24 15:06:26 +0000
committerGerrit Code Review <review@openstack.org>2020-07-24 15:06:26 +0000
commitd83e21e1bf5e9b0867f4a154f131502d36d1f38f (patch)
treead8068dd696013131c5ff60831cf625910fec889
parent94dfa8967d7e65a13b1f3ec506738a122b690d74 (diff)
parenta7ee205019e5e307b5d5c598dd3518ea6e42348e (diff)
downloadironic-d83e21e1bf5e9b0867f4a154f131502d36d1f38f.tar.gz
Merge "Enforce autospec in test_notification_utils"
-rw-r--r--ironic/tests/unit/conductor/test_notification_utils.py19
-rw-r--r--tox.ini1
2 files changed, 12 insertions, 8 deletions
diff --git a/ironic/tests/unit/conductor/test_notification_utils.py b/ironic/tests/unit/conductor/test_notification_utils.py
index cc8fe5320..dc3e1c43d 100644
--- a/ironic/tests/unit/conductor/test_notification_utils.py
+++ b/ironic/tests/unit/conductor/test_notification_utils.py
@@ -40,7 +40,8 @@ class TestNotificationUtils(db_base.DbTestCase):
'upgrade_lock', 'shared'])
self.task.node = self.node
- @mock.patch.object(notif_utils, '_emit_conductor_node_notification')
+ @mock.patch.object(notif_utils, '_emit_conductor_node_notification',
+ autospec=True)
def test_emit_power_state_corrected_notification(self, mock_cond_emit):
notif_utils.emit_power_state_corrected_notification(
self.task, states.POWER_ON)
@@ -54,7 +55,8 @@ class TestNotificationUtils(db_base.DbTestCase):
from_power=states.POWER_ON
)
- @mock.patch.object(notif_utils, '_emit_conductor_node_notification')
+ @mock.patch.object(notif_utils, '_emit_conductor_node_notification',
+ autospec=True)
def test_emit_power_set_notification(self, mock_cond_emit):
notif_utils.emit_power_set_notification(
self.task,
@@ -71,7 +73,8 @@ class TestNotificationUtils(db_base.DbTestCase):
to_power=states.POWER_ON
)
- @mock.patch.object(notif_utils, '_emit_conductor_node_notification')
+ @mock.patch.object(notif_utils, '_emit_conductor_node_notification',
+ autospec=True)
def test_emit_console_notification(self, mock_cond_emit):
notif_utils.emit_console_notification(
self.task, 'console_set', fields.NotificationStatus.END)
@@ -84,7 +87,8 @@ class TestNotificationUtils(db_base.DbTestCase):
fields.NotificationStatus.END,
)
- @mock.patch.object(notif_utils, '_emit_conductor_node_notification')
+ @mock.patch.object(notif_utils, '_emit_conductor_node_notification',
+ autospec=True)
def test_emit_console_notification_error_status(self, mock_cond_emit):
notif_utils.emit_console_notification(
self.task, 'console_set', fields.NotificationStatus.ERROR)
@@ -97,7 +101,7 @@ class TestNotificationUtils(db_base.DbTestCase):
fields.NotificationStatus.ERROR,
)
- @mock.patch.object(notification, 'mask_secrets')
+ @mock.patch.object(notification, 'mask_secrets', autospec=True)
def test__emit_conductor_node_notification(self, mock_secrets):
mock_notify_method = mock.Mock()
# Required for exception handling
@@ -152,7 +156,7 @@ class TestNotificationUtils(db_base.DbTestCase):
self.assertFalse(mock_notify_method.called)
- @mock.patch.object(notification, 'mask_secrets')
+ @mock.patch.object(notification, 'mask_secrets', autospec=True)
def test__emit_conductor_node_notification_known_notify_exc(self,
mock_secrets):
"""Test exception caught for a known notification exception."""
@@ -179,7 +183,8 @@ class TestNotificationUtils(db_base.DbTestCase):
class ProvisionNotifyTestCase(tests_base.TestCase):
- @mock.patch('ironic.objects.node.NodeSetProvisionStateNotification')
+ @mock.patch('ironic.objects.node.NodeSetProvisionStateNotification',
+ autospec=True)
def test_emit_notification(self, provision_mock):
provision_mock.__name__ = 'NodeSetProvisionStateNotification'
self.config(host='fake-host')
diff --git a/tox.ini b/tox.ini
index d57b99c10..a5d2997d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -131,7 +131,6 @@ per-file-ignores =
ironic/cmd/__init__.py:E402
ironic/tests/base.py:E402
ironic/tests/unit/api/*: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
ironic/tests/unit/drivers/modules/test_iscsi_deploy.py:H210