From f4c37bf11914f01e0deb67844000f806418ac59b Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Fri, 10 Dec 2021 07:27:09 +0100 Subject: Fix Mock objects as specs In Python 3.10 is not possible to use Mock objects as specs for Mock instances anymore. For more info see https://bugs.python.org/issue43478 Change-Id: Ia79ad659098c3e68432214782aeb5b8a9df99eb0 Story: 2009736 Task: 44161 --- ironic/tests/unit/drivers/modules/xclarity/test_common.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ironic/tests/unit/drivers/modules/xclarity') diff --git a/ironic/tests/unit/drivers/modules/xclarity/test_common.py b/ironic/tests/unit/drivers/modules/xclarity/test_common.py index b4667534d..1b01c13ec 100644 --- a/ironic/tests/unit/drivers/modules/xclarity/test_common.py +++ b/ironic/tests/unit/drivers/modules/xclarity/test_common.py @@ -95,8 +95,10 @@ class XClarityCommonTestCase(db_base.DbTestCase): self.assertRaises(exception.InvalidParameterValue, common.parse_driver_info, self.node) - @mock.patch.object(xclarity_client, 'Client', autospec=True) - def test_get_xclarity_client(self, mock_xclarityclient): + def test_get_xclarity_client(self): + if not mock._is_instance_mock(xclarity_client): + mock.patch.object(xclarity_client, 'Client', autospec=True).start() + mock_xclarityclient = xclarity_client.Client expected_call = mock.call(ip='1.2.3.4', password='fake', port=443, username='USERID') common.get_xclarity_client(self.node) -- cgit v1.2.1