openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Replace assertRaisesRegexp with assertRaisesRegex"

This commit is contained in:
Jenkins 2017-05-25 08:57:26 +00:00 committed by Gerrit Code Review
parent d74d69d8fa b125ed288f
commit 85c5a756bc
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tripleo_common/tests/actions/test_baremetal.py
View File

@ -262,10 +262,10 @@ class TestConfigureRootDeviceAction(base.TestCase):
action = baremetal.ConfigureRootDeviceAction(node_uuid='MOCK_UUID',
root_device='smallest')
self.assertRaisesRegexp(exception.RootDeviceDetectionError,
"Malformed introspection data",
action.run,
self.context)
self.assertRaisesRegex(exception.RootDeviceDetectionError,
"Malformed introspection data",
action.run,
self.context)
self.assertEqual(self.ironic.node.update.call_count, 0)
@ -278,10 +278,10 @@ class TestConfigureRootDeviceAction(base.TestCase):
action = baremetal.ConfigureRootDeviceAction(node_uuid='MOCK_UUID',
root_device='smallest')
self.assertRaisesRegexp(exception.RootDeviceDetectionError,
"No suitable disks",
action.run,
self.context)
self.assertRaisesRegex(exception.RootDeviceDetectionError,
"No suitable disks",
action.run,
self.context)
self.assertEqual(self.ironic.node.update.call_count, 0)
@ -291,10 +291,10 @@ class TestConfigureRootDeviceAction(base.TestCase):
action = baremetal.ConfigureRootDeviceAction(node_uuid='MOCK_UUID',
root_device='smallest')
self.assertRaisesRegexp(exception.RootDeviceDetectionError,
"No introspection data",
action.run,
self.context)
self.assertRaisesRegex(exception.RootDeviceDetectionError,
"No introspection data",
action.run,
self.context)
self.assertEqual(self.ironic.node.update.call_count, 0)
@ -307,10 +307,10 @@ class TestConfigureRootDeviceAction(base.TestCase):
action = baremetal.ConfigureRootDeviceAction(node_uuid='MOCK_UUID',
root_device='smallest')
self.assertRaisesRegexp(exception.RootDeviceDetectionError,
"Neither WWN nor serial number are known",
action.run,
self.context)
self.assertRaisesRegex(exception.RootDeviceDetectionError,
"Neither WWN nor serial number are known",
action.run,
self.context)
self.assertEqual(self.ironic.node.update.call_count, 0)
@ -333,10 +333,10 @@ class TestConfigureRootDeviceAction(base.TestCase):
action = baremetal.ConfigureRootDeviceAction(node_uuid='MOCK_UUID',
root_device='hda')
self.assertRaisesRegexp(exception.RootDeviceDetectionError,
"Cannot find a disk",
action.run,
self.context)
self.assertRaisesRegex(exception.RootDeviceDetectionError,
"Cannot find a disk",
action.run,
self.context)
self.assertEqual(self.ironic.node.update.call_count, 0)