1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
Description: 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.
Author: Riccardo Pittau <elfosardo@gmail.com>
Date: Wed, 07 Dec 2022 15:11:09 +0100
Change-Id: If7c10d9bfd0bb410b3bc5180b737439c92e515da
Bug-Debian: https://bugs.debian.org/1024783
Origin: upstream, https://review.opendev.org/c/openstack/ironic/+/866861
Last-Update: 2022-12-09
diff --git a/ironic/tests/unit/drivers/modules/irmc/test_inspect.py b/ironic/tests/unit/drivers/modules/irmc/test_inspect.py
index 5c66cb9..da91ec6 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 @@
_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 @@
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 @@
_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 @@
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()
|
