Replace assertRaisesRegexp
It was deprecated in python 3.2 and was removed in python 3.12. Change-Id: I53d00a109de7fcf80f8eafe90ce7bfed913c4c16
This commit is contained in:
parent
b4f1db2231
commit
50d484a4e8
|
@ -416,7 +416,7 @@ class ClientBIOSConfigurationTestCase(base.BaseTest):
|
|||
{'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})
|
||||
|
||||
|
@ -432,7 +432,7 @@ class ClientBIOSConfigurationTestCase(base.BaseTest):
|
|||
{'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'})
|
||||
|
||||
|
@ -448,7 +448,7 @@ class ClientBIOSConfigurationTestCase(base.BaseTest):
|
|||
{'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'})
|
||||
|
||||
|
@ -464,7 +464,7 @@ class ClientBIOSConfigurationTestCase(base.BaseTest):
|
|||
{'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})
|
||||
|
||||
|
|
|
@ -303,7 +303,7 @@ class ClientiDRACCardConfigurationTestCase(base.BaseTest):
|
|||
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'})
|
||||
|
@ -572,7 +572,7 @@ class ClientiDRACCardResetTestCase(base.BaseTest):
|
|||
test_utils.iDracCardInvocations[uris.DCIM_iDRACCardService][
|
||||
'iDRACReset']['error'])
|
||||
|
||||
self.assertRaisesRegexp(
|
||||
self.assertRaisesRegex(
|
||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||
self.drac_client.reset_idrac)
|
||||
|
||||
|
@ -620,7 +620,7 @@ class ClientiDRACCardResetTestCase(base.BaseTest):
|
|||
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)
|
||||
|
||||
|
@ -646,7 +646,7 @@ class ClientiDRACCardResetTestCase(base.BaseTest):
|
|||
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)
|
||||
|
||||
|
@ -672,7 +672,7 @@ class ClientiDRACCardResetTestCase(base.BaseTest):
|
|||
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)
|
||||
|
||||
|
|
|
@ -238,7 +238,7 @@ class ClientLCConfigurationTestCase(base.BaseTest):
|
|||
{'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'})
|
||||
|
||||
|
@ -256,7 +256,7 @@ class ClientLCConfigurationTestCase(base.BaseTest):
|
|||
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'})
|
||||
|
|
|
@ -355,7 +355,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',
|
||||
|
@ -374,7 +374,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',
|
||||
|
@ -393,7 +393,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',
|
||||
|
@ -412,7 +412,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',
|
||||
|
|
|
@ -289,7 +289,7 @@ class ClientRAIDManagementTestCase(base.BaseTest):
|
|||
{'text': test_utils.RAIDEnumerations[
|
||||
uris.DCIM_RAIDInteger]['ok']}])
|
||||
|
||||
self.assertRaisesRegexp(
|
||||
self.assertRaisesRegex(
|
||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||
self.drac_client.set_raid_settings,
|
||||
self.raid_controller_fqdd,
|
||||
|
@ -311,7 +311,7 @@ class ClientRAIDManagementTestCase(base.BaseTest):
|
|||
uris.DCIM_RAIDString]['ok']},
|
||||
{'text': test_utils.RAIDEnumerations[
|
||||
uris.DCIM_RAIDInteger]['ok']}])
|
||||
self.assertRaisesRegexp(
|
||||
self.assertRaisesRegex(
|
||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||
self.drac_client.set_raid_settings,
|
||||
self.raid_controller_fqdd,
|
||||
|
@ -1519,7 +1519,7 @@ class ClientRAIDManagementTestCase(base.BaseTest):
|
|||
mock_requests.post(
|
||||
'https://1.2.3.4:443/wsman',
|
||||
text=test_utils.RAIDEnumerations[uris.DCIM_ControllerView]['ok'])
|
||||
self.assertRaisesRegexp(
|
||||
self.assertRaisesRegex(
|
||||
exceptions.DRACOperationFailed,
|
||||
"OTHER_MESSAGE",
|
||||
self.drac_client.change_physical_disk_state,
|
||||
|
@ -1550,7 +1550,7 @@ class ClientRAIDManagementTestCase(base.BaseTest):
|
|||
mock_requests.post(
|
||||
'https://1.2.3.4:443/wsman',
|
||||
text=test_utils.RAIDEnumerations[uris.DCIM_ControllerView]['ok'])
|
||||
self.assertRaisesRegexp(
|
||||
self.assertRaisesRegex(
|
||||
Exception,
|
||||
"SOMETHING_BAD_HAPPENED",
|
||||
self.drac_client.change_physical_disk_state,
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Reference in New Issue