From 6f640c5f4baef6fb50ffeeb65ef42c62da3fc732 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 19 Feb 2024 02:13:27 +0900 Subject: [PATCH] Bump hacking hacking 3.0.x is too old. Change-Id: I1f7b136ab919563b795f571e6ae1deb18c118968 --- doc/requirements.txt | 4 ---- dracclient/client.py | 2 +- dracclient/tests/test_bios.py | 8 ++++---- dracclient/tests/test_idrac_card.py | 10 +++++----- dracclient/tests/test_lifecycle_controller.py | 4 ++-- dracclient/tests/test_nic.py | 8 ++++---- dracclient/tests/test_raid.py | 8 ++++---- dracclient/tests/test_utils.py | 6 +++--- requirements.txt | 4 ---- test-requirements.txt | 6 +----- 10 files changed, 24 insertions(+), 36 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index c481145..898fcc1 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,6 +1,2 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. - sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD openstackdocstheme # Apache-2.0 diff --git a/dracclient/client.py b/dracclient/client.py index 99fb063..6f358f3 100644 --- a/dracclient/client.py +++ b/dracclient/client.py @@ -890,7 +890,7 @@ class DRACClient(object): return self._raid_mgmt.delete_virtual_disk(virtual_disk) def reset_raid_config(self, raid_controller): - """Delete all the virtual disks and unassign all hot spare physical disks + """Delete all virtual disks and unassign all hot spare physical disks The job to reset the RAID controller config will be in pending state. For the changes to be applied, a config job must be created. diff --git a/dracclient/tests/test_bios.py b/dracclient/tests/test_bios.py index 0cc4c25..f0c951c 100644 --- a/dracclient/tests/test_bios.py +++ b/dracclient/tests/test_bios.py @@ -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}) diff --git a/dracclient/tests/test_idrac_card.py b/dracclient/tests/test_idrac_card.py index ebdcc57..81df9ad 100644 --- a/dracclient/tests/test_idrac_card.py +++ b/dracclient/tests/test_idrac_card.py @@ -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) diff --git a/dracclient/tests/test_lifecycle_controller.py b/dracclient/tests/test_lifecycle_controller.py index 136c201..cdacd00 100644 --- a/dracclient/tests/test_lifecycle_controller.py +++ b/dracclient/tests/test_lifecycle_controller.py @@ -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'}) diff --git a/dracclient/tests/test_nic.py b/dracclient/tests/test_nic.py index 2a4ea79..aa36bc9 100644 --- a/dracclient/tests/test_nic.py +++ b/dracclient/tests/test_nic.py @@ -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', diff --git a/dracclient/tests/test_raid.py b/dracclient/tests/test_raid.py index 7edc744..d73c35d 100644 --- a/dracclient/tests/test_raid.py +++ b/dracclient/tests/test_raid.py @@ -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, diff --git a/dracclient/tests/test_utils.py b/dracclient/tests/test_utils.py index 171d551..7db3670 100644 --- a/dracclient/tests/test_utils.py +++ b/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') diff --git a/requirements.txt b/requirements.txt index d6f45ef..5bf8225 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,3 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. - lxml>=2.3 pbr>=1.6 requests>=2.10.0 diff --git a/test-requirements.txt b/test-requirements.txt index 97ee321..23b8dfc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,4 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. - coverage>=3.6 doc8 -hacking>=3.0.1,<3.1.0 # Apache-2.0 +hacking>=6.1.0,<6.2.0 # Apache-2.0 requests-mock>=1.0