Bump hacking
hacking 3.0.x is too old. Change-Id: I1f7b136ab919563b795f571e6ae1deb18c118968
This commit is contained in:
parent
b4f1db2231
commit
6f640c5f4b
@ -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
|
sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD
|
||||||
openstackdocstheme # Apache-2.0
|
openstackdocstheme # Apache-2.0
|
||||||
|
@ -890,7 +890,7 @@ class DRACClient(object):
|
|||||||
return self._raid_mgmt.delete_virtual_disk(virtual_disk)
|
return self._raid_mgmt.delete_virtual_disk(virtual_disk)
|
||||||
|
|
||||||
def reset_raid_config(self, raid_controller):
|
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.
|
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.
|
For the changes to be applied, a config job must be created.
|
||||||
|
@ -416,7 +416,7 @@ class ClientBIOSConfigurationTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.BIOSEnumerations[
|
{'text': test_utils.BIOSEnumerations[
|
||||||
uris.DCIM_BIOSInteger]['ok']}])
|
uris.DCIM_BIOSInteger]['ok']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_bios_settings, {'Proc1NumCores': 42})
|
self.drac_client.set_bios_settings, {'Proc1NumCores': 42})
|
||||||
|
|
||||||
@ -432,7 +432,7 @@ class ClientBIOSConfigurationTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.BIOSEnumerations[
|
{'text': test_utils.BIOSEnumerations[
|
||||||
uris.DCIM_BIOSInteger]['ok']}])
|
uris.DCIM_BIOSInteger]['ok']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_bios_settings, {'MemTest': 'foo'})
|
self.drac_client.set_bios_settings, {'MemTest': 'foo'})
|
||||||
|
|
||||||
@ -448,7 +448,7 @@ class ClientBIOSConfigurationTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.BIOSEnumerations[
|
{'text': test_utils.BIOSEnumerations[
|
||||||
uris.DCIM_BIOSInteger]['ok']}])
|
uris.DCIM_BIOSInteger]['ok']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_bios_settings, {'SystemModelName': 'bar'})
|
self.drac_client.set_bios_settings, {'SystemModelName': 'bar'})
|
||||||
|
|
||||||
@ -464,7 +464,7 @@ class ClientBIOSConfigurationTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.BIOSEnumerations[
|
{'text': test_utils.BIOSEnumerations[
|
||||||
uris.DCIM_BIOSInteger]['mutable']}])
|
uris.DCIM_BIOSInteger]['mutable']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_bios_settings, {'Proc1NumCores': -42})
|
self.drac_client.set_bios_settings, {'Proc1NumCores': -42})
|
||||||
|
|
||||||
|
@ -303,7 +303,7 @@ class ClientiDRACCardConfigurationTestCase(base.BaseTest):
|
|||||||
uris.DCIM_iDRACCardString]['ok']},
|
uris.DCIM_iDRACCardString]['ok']},
|
||||||
{'text': test_utils.iDracCardEnumerations[
|
{'text': test_utils.iDracCardEnumerations[
|
||||||
uris.DCIM_iDRACCardInteger]['ok']}])
|
uris.DCIM_iDRACCardInteger]['ok']}])
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_idrac_settings,
|
self.drac_client.set_idrac_settings,
|
||||||
{'Users.16#Password': '123456789012345678901'})
|
{'Users.16#Password': '123456789012345678901'})
|
||||||
@ -572,7 +572,7 @@ class ClientiDRACCardResetTestCase(base.BaseTest):
|
|||||||
test_utils.iDracCardInvocations[uris.DCIM_iDRACCardService][
|
test_utils.iDracCardInvocations[uris.DCIM_iDRACCardService][
|
||||||
'iDRACReset']['error'])
|
'iDRACReset']['error'])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.reset_idrac)
|
self.drac_client.reset_idrac)
|
||||||
|
|
||||||
@ -620,7 +620,7 @@ class ClientiDRACCardResetTestCase(base.BaseTest):
|
|||||||
mock_sleep.return_value = None
|
mock_sleep.return_value = None
|
||||||
expected_message = ("Failed to reset iDRAC")
|
expected_message = ("Failed to reset iDRAC")
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.reset_idrac, wait=True)
|
self.drac_client.reset_idrac, wait=True)
|
||||||
|
|
||||||
@ -646,7 +646,7 @@ class ClientiDRACCardResetTestCase(base.BaseTest):
|
|||||||
expected_message = (
|
expected_message = (
|
||||||
"Timed out waiting for the 1.2.3.4 iDRAC to become not pingable")
|
"Timed out waiting for the 1.2.3.4 iDRAC to become not pingable")
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.reset_idrac, wait=True)
|
self.drac_client.reset_idrac, wait=True)
|
||||||
|
|
||||||
@ -672,7 +672,7 @@ class ClientiDRACCardResetTestCase(base.BaseTest):
|
|||||||
expected_message = (
|
expected_message = (
|
||||||
"Timed out waiting for the 1.2.3.4 iDRAC to become pingable")
|
"Timed out waiting for the 1.2.3.4 iDRAC to become pingable")
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.reset_idrac, wait=True)
|
self.drac_client.reset_idrac, wait=True)
|
||||||
|
|
||||||
|
@ -238,7 +238,7 @@ class ClientLCConfigurationTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.LifecycleControllerEnumerations[
|
{'text': test_utils.LifecycleControllerEnumerations[
|
||||||
uris.DCIM_LCString]['ok']}])
|
uris.DCIM_LCString]['ok']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_lifecycle_settings, {'Licensed': 'yes'})
|
self.drac_client.set_lifecycle_settings, {'Licensed': 'yes'})
|
||||||
|
|
||||||
@ -256,7 +256,7 @@ class ClientLCConfigurationTestCase(base.BaseTest):
|
|||||||
uris.DCIM_LCEnumeration]['ok']},
|
uris.DCIM_LCEnumeration]['ok']},
|
||||||
{'text': test_utils.LifecycleControllerEnumerations[
|
{'text': test_utils.LifecycleControllerEnumerations[
|
||||||
uris.DCIM_LCString]['ok']}])
|
uris.DCIM_LCString]['ok']}])
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_lifecycle_settings,
|
self.drac_client.set_lifecycle_settings,
|
||||||
{'Lifecycle Controller State': 'foo'})
|
{'Lifecycle Controller State': 'foo'})
|
||||||
|
@ -355,7 +355,7 @@ class ClientNICTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.NICEnumerations[
|
{'text': test_utils.NICEnumerations[
|
||||||
uris.DCIM_NICInteger]['ok']}])
|
uris.DCIM_NICInteger]['ok']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_nic_settings,
|
self.drac_client.set_nic_settings,
|
||||||
'NIC.Integrated.1-3-1',
|
'NIC.Integrated.1-3-1',
|
||||||
@ -374,7 +374,7 @@ class ClientNICTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.NICEnumerations[
|
{'text': test_utils.NICEnumerations[
|
||||||
uris.DCIM_NICInteger]['ok']}])
|
uris.DCIM_NICInteger]['ok']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_nic_settings,
|
self.drac_client.set_nic_settings,
|
||||||
'NIC.Integrated.1-3-1',
|
'NIC.Integrated.1-3-1',
|
||||||
@ -393,7 +393,7 @@ class ClientNICTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.NICEnumerations[
|
{'text': test_utils.NICEnumerations[
|
||||||
uris.DCIM_NICInteger]['ok']}])
|
uris.DCIM_NICInteger]['ok']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_nic_settings,
|
self.drac_client.set_nic_settings,
|
||||||
'NIC.Integrated.1-3-1',
|
'NIC.Integrated.1-3-1',
|
||||||
@ -412,7 +412,7 @@ class ClientNICTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.NICEnumerations[
|
{'text': test_utils.NICEnumerations[
|
||||||
uris.DCIM_NICInteger]['ok']}])
|
uris.DCIM_NICInteger]['ok']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_nic_settings,
|
self.drac_client.set_nic_settings,
|
||||||
'NIC.Integrated.1-3-1',
|
'NIC.Integrated.1-3-1',
|
||||||
|
@ -289,7 +289,7 @@ class ClientRAIDManagementTestCase(base.BaseTest):
|
|||||||
{'text': test_utils.RAIDEnumerations[
|
{'text': test_utils.RAIDEnumerations[
|
||||||
uris.DCIM_RAIDInteger]['ok']}])
|
uris.DCIM_RAIDInteger]['ok']}])
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_raid_settings,
|
self.drac_client.set_raid_settings,
|
||||||
self.raid_controller_fqdd,
|
self.raid_controller_fqdd,
|
||||||
@ -311,7 +311,7 @@ class ClientRAIDManagementTestCase(base.BaseTest):
|
|||||||
uris.DCIM_RAIDString]['ok']},
|
uris.DCIM_RAIDString]['ok']},
|
||||||
{'text': test_utils.RAIDEnumerations[
|
{'text': test_utils.RAIDEnumerations[
|
||||||
uris.DCIM_RAIDInteger]['ok']}])
|
uris.DCIM_RAIDInteger]['ok']}])
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed, re.escape(expected_message),
|
exceptions.DRACOperationFailed, re.escape(expected_message),
|
||||||
self.drac_client.set_raid_settings,
|
self.drac_client.set_raid_settings,
|
||||||
self.raid_controller_fqdd,
|
self.raid_controller_fqdd,
|
||||||
@ -1519,7 +1519,7 @@ class ClientRAIDManagementTestCase(base.BaseTest):
|
|||||||
mock_requests.post(
|
mock_requests.post(
|
||||||
'https://1.2.3.4:443/wsman',
|
'https://1.2.3.4:443/wsman',
|
||||||
text=test_utils.RAIDEnumerations[uris.DCIM_ControllerView]['ok'])
|
text=test_utils.RAIDEnumerations[uris.DCIM_ControllerView]['ok'])
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACOperationFailed,
|
exceptions.DRACOperationFailed,
|
||||||
"OTHER_MESSAGE",
|
"OTHER_MESSAGE",
|
||||||
self.drac_client.change_physical_disk_state,
|
self.drac_client.change_physical_disk_state,
|
||||||
@ -1550,7 +1550,7 @@ class ClientRAIDManagementTestCase(base.BaseTest):
|
|||||||
mock_requests.post(
|
mock_requests.post(
|
||||||
'https://1.2.3.4:443/wsman',
|
'https://1.2.3.4:443/wsman',
|
||||||
text=test_utils.RAIDEnumerations[uris.DCIM_ControllerView]['ok'])
|
text=test_utils.RAIDEnumerations[uris.DCIM_ControllerView]['ok'])
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
Exception,
|
Exception,
|
||||||
"SOMETHING_BAD_HAPPENED",
|
"SOMETHING_BAD_HAPPENED",
|
||||||
self.drac_client.change_physical_disk_state,
|
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,
|
cpus = utils.find_xml(doc, 'DCIM_CPUView', uris.DCIM_CPUView,
|
||||||
find_all=True)
|
find_all=True)
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACMissingResponseField, re.escape(expected_message),
|
exceptions.DRACMissingResponseField, re.escape(expected_message),
|
||||||
utils.get_wsman_resource_attr, cpus[0], uris.DCIM_CPUView,
|
utils.get_wsman_resource_attr, cpus[0], uris.DCIM_CPUView,
|
||||||
'HyperThreadingEnabled', allow_missing=False)
|
'HyperThreadingEnabled', allow_missing=False)
|
||||||
@ -97,7 +97,7 @@ class UtilsTestCase(base.BaseTest):
|
|||||||
cpus = utils.find_xml(doc, 'DCIM_CPUView', uris.DCIM_CPUView,
|
cpus = utils.find_xml(doc, 'DCIM_CPUView', uris.DCIM_CPUView,
|
||||||
find_all=True)
|
find_all=True)
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACEmptyResponseField, re.escape(expected_message),
|
exceptions.DRACEmptyResponseField, re.escape(expected_message),
|
||||||
utils.get_wsman_resource_attr, cpus[0], uris.DCIM_CPUView,
|
utils.get_wsman_resource_attr, cpus[0], uris.DCIM_CPUView,
|
||||||
'HyperThreadingEnabled', allow_missing=False)
|
'HyperThreadingEnabled', allow_missing=False)
|
||||||
@ -150,7 +150,7 @@ class UtilsTestCase(base.BaseTest):
|
|||||||
cpus = utils.find_xml(doc, 'DCIM_CPUView', uris.DCIM_CPUView,
|
cpus = utils.find_xml(doc, 'DCIM_CPUView', uris.DCIM_CPUView,
|
||||||
find_all=True)
|
find_all=True)
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exceptions.DRACEmptyResponseField, re.escape(expected_message),
|
exceptions.DRACEmptyResponseField, re.escape(expected_message),
|
||||||
utils.get_all_wsman_resource_attrs, cpus[0], uris.DCIM_CPUView,
|
utils.get_all_wsman_resource_attrs, cpus[0], uris.DCIM_CPUView,
|
||||||
'HyperThreadingEnabled')
|
'HyperThreadingEnabled')
|
||||||
|
@ -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
|
lxml>=2.3
|
||||||
pbr>=1.6
|
pbr>=1.6
|
||||||
requests>=2.10.0
|
requests>=2.10.0
|
||||||
|
@ -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
|
coverage>=3.6
|
||||||
doc8
|
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
|
requests-mock>=1.0
|
||||||
|
Loading…
Reference in New Issue
Block a user