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

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

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