diff --git a/ironic/tests/drivers/irmc/test_management.py b/ironic/tests/drivers/irmc/test_management.py index 30f1234a49d..d3895aae833 100644 --- a/ironic/tests/drivers/irmc/test_management.py +++ b/ironic/tests/drivers/irmc/test_management.py @@ -57,14 +57,16 @@ class IRMCManagementTestCase(db_base.DbTestCase): shared=True) as task: self.assertEqual(expected, task.driver.get_properties()) - @mock.patch.object(irmc_common, 'parse_driver_info', autospec=True) + @mock.patch.object(irmc_common, 'parse_driver_info', spec_set=True, + autospec=True) def test_validate(self, mock_drvinfo): with task_manager.acquire(self.context, self.node.uuid, shared=True) as task: task.driver.management.validate(task) mock_drvinfo.assert_called_once_with(task.node) - @mock.patch.object(irmc_common, 'parse_driver_info', autospec=True) + @mock.patch.object(irmc_common, 'parse_driver_info', spec_set=True, + autospec=True) def test_validate_fail(self, mock_drvinfo): side_effect = exception.InvalidParameterValue("Invalid Input") mock_drvinfo.side_effect = side_effect @@ -83,7 +85,7 @@ class IRMCManagementTestCase(db_base.DbTestCase): get_supported_boot_devices())) @mock.patch.object(ipmitool.IPMIManagement, 'set_boot_device', - autospec=True) + spec_set=True, autospec=True) def test_management_interface_set_boot_device_no_mode_ok( self, set_boot_device_mock): @@ -97,7 +99,7 @@ class IRMCManagementTestCase(db_base.DbTestCase): False) @mock.patch.object(ipmitool.IPMIManagement, 'set_boot_device', - autospec=True) + spec_set=True, autospec=True) def test_management_interface_set_boot_device_bios_ok( self, set_boot_device_mock): @@ -110,7 +112,8 @@ class IRMCManagementTestCase(db_base.DbTestCase): boot_devices.PXE, False) - @mock.patch.object(irmc_management.ipmitool, "send_raw", autospec=True) + @mock.patch.object(irmc_management.ipmitool, "send_raw", spec_set=True, + autospec=True) def _test_management_interface_set_boot_device_uefi_ok(self, params, expected_raw_code, send_raw_mock): @@ -179,7 +182,8 @@ class IRMCManagementTestCase(db_base.DbTestCase): params, "0x00 0x08 0x05 0xe0 0x0c 0x00 0x00 0x00") - @mock.patch.object(irmc_management.ipmitool, "send_raw", autospec=True) + @mock.patch.object(irmc_management.ipmitool, "send_raw", spec_set=True, + autospec=True) def test_management_interface_set_boot_device_uefi_ng(self, send_raw_mock): """uefi mode, next boot only, unknown device.""" @@ -194,7 +198,8 @@ class IRMCManagementTestCase(db_base.DbTestCase): @mock.patch.object(irmc_management, 'scci', spec_set=mock_specs.SCCICLIENT_IRMC_SCCI_SPEC) - @mock.patch.object(irmc_common, 'get_irmc_report', autospec=True) + @mock.patch.object(irmc_common, 'get_irmc_report', spec_set=True, + autospec=True) def test_management_interface_get_sensors_data_scci_ok(self, mock_get_irmc_report, mock_scci): @@ -242,7 +247,8 @@ class IRMCManagementTestCase(db_base.DbTestCase): @mock.patch.object(irmc_management, 'scci', spec_set=mock_specs.SCCICLIENT_IRMC_SCCI_SPEC) - @mock.patch.object(irmc_common, 'get_irmc_report', autospec=True) + @mock.patch.object(irmc_common, 'get_irmc_report', spec_set=True, + autospec=True) def test_management_interface_get_sensors_data_scci_ng(self, mock_get_irmc_report, mock_scci): @@ -263,7 +269,7 @@ class IRMCManagementTestCase(db_base.DbTestCase): self.assertEqual(len(sensor_dict), 0) @mock.patch.object(ipmitool.IPMIManagement, 'get_sensors_data', - autospec=True) + spec_set=True, autospec=True) def test_management_interface_get_sensors_data_ipmitool_ok( self, get_sensors_data_mock): @@ -274,7 +280,8 @@ class IRMCManagementTestCase(db_base.DbTestCase): get_sensors_data_mock.assert_called_once_with( task.driver.management, task) - @mock.patch.object(irmc_common, 'get_irmc_report', autospec=True) + @mock.patch.object(irmc_common, 'get_irmc_report', spec_set=True, + autospec=True) def test_management_interface_get_sensors_data_exception1( self, get_irmc_report_mock): diff --git a/ironic/tests/drivers/irmc/test_power.py b/ironic/tests/drivers/irmc/test_power.py index bb351667b9c..4b5401df6cb 100644 --- a/ironic/tests/drivers/irmc/test_power.py +++ b/ironic/tests/drivers/irmc/test_power.py @@ -32,7 +32,8 @@ INFO_DICT = db_utils.get_test_irmc_info() CONF = cfg.CONF -@mock.patch.object(irmc_common, 'get_irmc_client', autospec=True) +@mock.patch.object(irmc_common, 'get_irmc_client', spec_set=True, + autospec=True) class IRMCPowerInternalMethodsTestCase(db_base.DbTestCase): def setUp(self): @@ -110,14 +111,16 @@ class IRMCPowerTestCase(db_base.DbTestCase): for prop in irmc_common.COMMON_PROPERTIES: self.assertIn(prop, properties) - @mock.patch.object(irmc_common, 'parse_driver_info', autospec=True) + @mock.patch.object(irmc_common, 'parse_driver_info', spec_set=True, + autospec=True) def test_validate(self, mock_drvinfo): with task_manager.acquire(self.context, self.node.uuid, shared=True) as task: task.driver.power.validate(task) mock_drvinfo.assert_called_once_with(task.node) - @mock.patch.object(irmc_common, 'parse_driver_info', autospec=True) + @mock.patch.object(irmc_common, 'parse_driver_info', spec_set=True, + autospec=True) def test_validate_fail(self, mock_drvinfo): side_effect = exception.InvalidParameterValue("Invalid Input") mock_drvinfo.side_effect = side_effect @@ -128,7 +131,7 @@ class IRMCPowerTestCase(db_base.DbTestCase): task) @mock.patch('ironic.drivers.modules.irmc.power.ipmitool.IPMIPower', - autospec=True) + spec_set=True, autospec=True) def test_get_power_state(self, mock_IPMIPower): ipmi_power = mock_IPMIPower.return_value ipmi_power.get_power_state.return_value = states.POWER_ON @@ -138,7 +141,8 @@ class IRMCPowerTestCase(db_base.DbTestCase): task.driver.power.get_power_state(task)) ipmi_power.get_power_state.assert_called_once_with(task) - @mock.patch.object(irmc_power, '_set_power_state', autospec=True) + @mock.patch.object(irmc_power, '_set_power_state', spec_set=True, + autospec=True) def test_set_power_state(self, mock_set_power): mock_set_power.return_value = states.POWER_ON with task_manager.acquire(self.context, self.node.uuid, @@ -146,8 +150,10 @@ class IRMCPowerTestCase(db_base.DbTestCase): task.driver.power.set_power_state(task, states.POWER_ON) mock_set_power.assert_called_once_with(task, states.POWER_ON) - @mock.patch.object(irmc_power, '_set_power_state', autospec=True) - @mock.patch.object(irmc_power.IRMCPower, 'get_power_state', autospec=True) + @mock.patch.object(irmc_power, '_set_power_state', spec_set=True, + autospec=True) + @mock.patch.object(irmc_power.IRMCPower, 'get_power_state', spec_set=True, + autospec=True) def test_reboot_reboot(self, mock_get_power, mock_set_power): with task_manager.acquire(self.context, self.node.uuid, shared=False) as task: @@ -157,8 +163,10 @@ class IRMCPowerTestCase(db_base.DbTestCase): task.driver.power, task) mock_set_power.assert_called_once_with(task, states.REBOOT) - @mock.patch.object(irmc_power, '_set_power_state', autospec=True) - @mock.patch.object(irmc_power.IRMCPower, 'get_power_state', autospec=True) + @mock.patch.object(irmc_power, '_set_power_state', spec_set=True, + autospec=True) + @mock.patch.object(irmc_power.IRMCPower, 'get_power_state', spec_set=True, + autospec=True) def test_reboot_power_on(self, mock_get_power, mock_set_power): with task_manager.acquire(self.context, self.node.uuid, shared=False) as task: