summaryrefslogtreecommitdiff
path: root/ironic/tests/unit/drivers/modules/redfish/test_management.py
diff options
context:
space:
mode:
authorAija Jauntēva <aija.jaunteva@dell.com>2020-10-06 06:48:25 -0400
committerAija Jauntēva <aija.jaunteva@dell.com>2020-11-13 05:17:40 -0500
commit870181f3ae1a82fdd156d85520c58159d02d00cc (patch)
treef4832c964a3e84a51d776983b9633b94453f2cda /ironic/tests/unit/drivers/modules/redfish/test_management.py
parent1cdf582d83d018dd6b31c4b3717dd78aeaf528d6 (diff)
downloadironic-870181f3ae1a82fdd156d85520c58159d02d00cc.tar.gz
Update `cleaning_error_handler`
Update `cleaning_error_handler` to match with `deploying_error_handler` that logs all errors and optionally separates between logged message and `last_error`. Logged message usually contains node's uuid as there is no context for node in stream of log entries. `last_error` usually does not contain node's uuid as it is already displayed in the context of node. Impact: * There were messages that were only added to node's last_error. Now they are going to be logged too. * No need to log explicitly before `cleaning_error_handler`. Such occurrences have been removed. * Where there were different message for log and last_error it is kept. Where there was only 1 message, it is left as it is to be both logged and updated in `last_error`. * Exception logging is replaced with error logging with traceback. Story: 2008307 Task: 41198 Change-Id: I813228fb47a51ee6c45b420322acabdf565ff752
Diffstat (limited to 'ironic/tests/unit/drivers/modules/redfish/test_management.py')
-rw-r--r--ironic/tests/unit/drivers/modules/redfish/test_management.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/ironic/tests/unit/drivers/modules/redfish/test_management.py b/ironic/tests/unit/drivers/modules/redfish/test_management.py
index f592c0865..a1fb4e8d0 100644
--- a/ironic/tests/unit/drivers/modules/redfish/test_management.py
+++ b/ironic/tests/unit/drivers/modules/redfish/test_management.py
@@ -1093,11 +1093,9 @@ class RedfishManagementTestCase(db_base.DbTestCase):
self.assertTrue(mock_log.called)
@mock.patch.object(manager_utils, 'cleaning_error_handler', autospec=True)
- @mock.patch.object(redfish_mgmt.LOG, 'error', autospec=True)
@mock.patch.object(redfish_utils, 'get_update_service', autospec=True)
def test__check_node_firmware_update_fail(self,
mock_get_update_service,
- mock_log,
mock_cleaning_error_handler):
mock_sushy_task = mock.Mock()
mock_sushy_task.task_state = 'exception'
@@ -1131,7 +1129,6 @@ class RedfishManagementTestCase(db_base.DbTestCase):
management._check_node_firmware_update(task)
task.upgrade_lock.assert_called_once_with()
- self.assertTrue(mock_log.called)
self.assertEqual({'something': 'else'},
task.node.driver_internal_info)
mock_cleaning_error_handler.assert_called_once()