diff options
| author | Riccardo Pittau <elfosardo@gmail.com> | 2022-12-07 15:11:09 +0100 |
|---|---|---|
| committer | Riccardo Pittau <elfosardo@gmail.com> | 2022-12-07 15:11:09 +0100 |
| commit | 342f4b37d757ac247aece95f7a4c3410a026b625 (patch) | |
| tree | 95e9f4cab2467992483612cbfd30202875150507 | |
| parent | 4d66609e95a1c7f5fb0fe0f61f95cf83d09da4d8 (diff) | |
| download | ironic-342f4b37d757ac247aece95f7a4c3410a026b625.tar.gz | |
Fix unit tests for Python 3.11
Mocks can no longer be provided as the specs for other Mocks.
See https://github.com/python/cpython/issues/87644 and
https://docs.python.org/3.11/whatsnew/3.11.html for more info.
Change-Id: If7c10d9bfd0bb410b3bc5180b737439c92e515da
| -rw-r--r-- | ironic/tests/unit/drivers/modules/irmc/test_inspect.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ironic/tests/unit/drivers/modules/irmc/test_inspect.py b/ironic/tests/unit/drivers/modules/irmc/test_inspect.py index 5c66cb96a..da91ec61d 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_inspect.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_inspect.py @@ -204,8 +204,8 @@ class IRMCInspectTestCase(test_common.BaseIRMCTest): _inspect_hardware_mock.return_value = (inspected_props, inspected_macs, new_traits) - new_port_mock1 = mock.MagicMock(spec=objects.Port) - new_port_mock2 = mock.MagicMock(spec=objects.Port) + new_port_mock1 = objects.Port + new_port_mock2 = objects.Port port_mock.side_effect = [new_port_mock1, new_port_mock2] @@ -220,11 +220,11 @@ class IRMCInspectTestCase(test_common.BaseIRMCTest): port_mock.assert_has_calls([ mock.call(task.context, address=inspected_macs[0], node_id=node_id), + mock.call.create(), mock.call(task.context, address=inspected_macs[1], - node_id=node_id) - ]) - new_port_mock1.create.assert_called_once_with() - new_port_mock2.create.assert_called_once_with() + node_id=node_id), + mock.call.create() + ], any_order=False) self.assertTrue(info_mock.called) task.node.refresh() @@ -259,8 +259,9 @@ class IRMCInspectTestCase(test_common.BaseIRMCTest): _inspect_hardware_mock.return_value = (inspected_props, inspected_macs, new_traits) - new_port_mock1 = mock.MagicMock(spec=objects.Port) - new_port_mock2 = mock.MagicMock(spec=objects.Port) + + new_port_mock1 = objects.Port + new_port_mock2 = objects.Port port_mock.side_effect = [new_port_mock1, new_port_mock2] @@ -276,11 +277,11 @@ class IRMCInspectTestCase(test_common.BaseIRMCTest): port_mock.assert_has_calls([ mock.call(task.context, address=inspected_macs[0], node_id=node_id), + mock.call.create(), mock.call(task.context, address=inspected_macs[1], - node_id=node_id) - ]) - new_port_mock1.create.assert_called_once_with() - new_port_mock2.create.assert_called_once_with() + node_id=node_id), + mock.call.create() + ], any_order=False) self.assertTrue(info_mock.called) task.node.refresh() |