Description: assertRaisesRegexp becomes assertRaisesRegex assertRaisesRegexp is removed from Python 3.12 Author: Thomas Goirand Bug-Debian: https://bugs.debian.org/1058241 Forwarded: no Last-Update: 2023-12-14 Index: python-dracclient/dracclient/tests/test_bios.py =================================================================== --- python-dracclient.orig/dracclient/tests/test_bios.py +++ python-dracclient/dracclient/tests/test_bios.py @@ -415,7 +415,7 @@ class ClientBIOSConfigurationTestCase(ba {'text': test_utils.BIOSEnumerations[ uris.DCIM_BIOSInteger]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_bios_settings, {'Proc1NumCores': 42}) @@ -431,7 +431,7 @@ class ClientBIOSConfigurationTestCase(ba {'text': test_utils.BIOSEnumerations[ uris.DCIM_BIOSInteger]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_bios_settings, {'MemTest': 'foo'}) @@ -447,7 +447,7 @@ class ClientBIOSConfigurationTestCase(ba {'text': test_utils.BIOSEnumerations[ uris.DCIM_BIOSInteger]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_bios_settings, {'SystemModelName': 'bar'}) @@ -463,7 +463,7 @@ class ClientBIOSConfigurationTestCase(ba {'text': test_utils.BIOSEnumerations[ uris.DCIM_BIOSInteger]['mutable']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_bios_settings, {'Proc1NumCores': -42}) Index: python-dracclient/dracclient/tests/test_idrac_card.py =================================================================== --- python-dracclient.orig/dracclient/tests/test_idrac_card.py +++ python-dracclient/dracclient/tests/test_idrac_card.py @@ -261,7 +261,7 @@ class ClientiDRACCardConfigurationTestCa uris.DCIM_iDRACCardString]['ok']}, {'text': test_utils.iDracCardEnumerations[ uris.DCIM_iDRACCardInteger]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_idrac_settings, {'Users.16#Password': '123456789012345678901'}) @@ -530,7 +530,7 @@ class ClientiDRACCardResetTestCase(base. test_utils.iDracCardInvocations[uris.DCIM_iDRACCardService][ 'iDRACReset']['error']) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.reset_idrac) @@ -578,7 +578,7 @@ class ClientiDRACCardResetTestCase(base. mock_sleep.return_value = None expected_message = ("Failed to reset iDRAC") - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.reset_idrac, wait=True) @@ -604,7 +604,7 @@ class ClientiDRACCardResetTestCase(base. expected_message = ( "Timed out waiting for the 1.2.3.4 iDRAC to become not pingable") - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.reset_idrac, wait=True) @@ -630,7 +630,7 @@ class ClientiDRACCardResetTestCase(base. expected_message = ( "Timed out waiting for the 1.2.3.4 iDRAC to become pingable") - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.reset_idrac, wait=True) Index: python-dracclient/dracclient/tests/test_nic.py =================================================================== --- python-dracclient.orig/dracclient/tests/test_nic.py +++ python-dracclient/dracclient/tests/test_nic.py @@ -354,7 +354,7 @@ class ClientNICTestCase(base.BaseTest): {'text': test_utils.NICEnumerations[ uris.DCIM_NICInteger]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_nic_settings, 'NIC.Integrated.1-3-1', @@ -373,7 +373,7 @@ class ClientNICTestCase(base.BaseTest): {'text': test_utils.NICEnumerations[ uris.DCIM_NICInteger]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_nic_settings, 'NIC.Integrated.1-3-1', @@ -392,7 +392,7 @@ class ClientNICTestCase(base.BaseTest): {'text': test_utils.NICEnumerations[ uris.DCIM_NICInteger]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_nic_settings, 'NIC.Integrated.1-3-1', @@ -411,7 +411,7 @@ class ClientNICTestCase(base.BaseTest): {'text': test_utils.NICEnumerations[ uris.DCIM_NICInteger]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_nic_settings, 'NIC.Integrated.1-3-1', Index: python-dracclient/dracclient/tests/test_raid.py =================================================================== --- python-dracclient.orig/dracclient/tests/test_raid.py +++ python-dracclient/dracclient/tests/test_raid.py @@ -1211,7 +1211,7 @@ class ClientRAIDManagementTestCase(base. physical_disks = [disk_1_non_raid, disk_2_non_raid, self.disk_3, self.disk_4] mock_list_physical_disks.return_value = physical_disks - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, "OTHER_MESSAGE", self.drac_client.change_physical_disk_state, @@ -1235,7 +1235,7 @@ class ClientRAIDManagementTestCase(base. physical_disks = [disk_1_non_raid, disk_2_non_raid, self.disk_3, self.disk_4] mock_list_physical_disks.return_value = physical_disks - self.assertRaisesRegexp( + self.assertRaisesRegex( Exception, "SOMETHING_BAD_HAPPENED", self.drac_client.change_physical_disk_state, Index: python-dracclient/dracclient/tests/test_utils.py =================================================================== --- python-dracclient.orig/dracclient/tests/test_utils.py +++ python-dracclient/dracclient/tests/test_utils.py @@ -70,7 +70,7 @@ class UtilsTestCase(base.BaseTest): cpus = utils.find_xml(doc, 'DCIM_CPUView', uris.DCIM_CPUView, find_all=True) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACMissingResponseField, re.escape(expected_message), utils.get_wsman_resource_attr, cpus[0], uris.DCIM_CPUView, 'HyperThreadingEnabled', allow_missing=False) @@ -97,7 +97,7 @@ class UtilsTestCase(base.BaseTest): cpus = utils.find_xml(doc, 'DCIM_CPUView', uris.DCIM_CPUView, find_all=True) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACEmptyResponseField, re.escape(expected_message), utils.get_wsman_resource_attr, cpus[0], uris.DCIM_CPUView, 'HyperThreadingEnabled', allow_missing=False) @@ -150,7 +150,7 @@ class UtilsTestCase(base.BaseTest): cpus = utils.find_xml(doc, 'DCIM_CPUView', uris.DCIM_CPUView, find_all=True) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACEmptyResponseField, re.escape(expected_message), utils.get_all_wsman_resource_attrs, cpus[0], uris.DCIM_CPUView, 'HyperThreadingEnabled') Index: python-dracclient/dracclient/tests/test_lifecycle_controller.py =================================================================== --- python-dracclient.orig/dracclient/tests/test_lifecycle_controller.py +++ python-dracclient/dracclient/tests/test_lifecycle_controller.py @@ -237,7 +237,7 @@ class ClientLCConfigurationTestCase(base {'text': test_utils.LifecycleControllerEnumerations[ uris.DCIM_LCString]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_lifecycle_settings, {'Licensed': 'yes'}) @@ -255,7 +255,7 @@ class ClientLCConfigurationTestCase(base uris.DCIM_LCEnumeration]['ok']}, {'text': test_utils.LifecycleControllerEnumerations[ uris.DCIM_LCString]['ok']}]) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.DRACOperationFailed, re.escape(expected_message), self.drac_client.set_lifecycle_settings, {'Lifecycle Controller State': 'foo'})