From b125ed288f633b03eaa58f240d88e69581d3b079 Mon Sep 17 00:00:00 2001 From: rajat29 Date: Wed, 24 May 2017 10:36:19 +0530 Subject: [PATCH] Replace assertRaisesRegexp with assertRaisesRegex This replaces the deprecated (in python 3.2) unittest.TestCase method assertRaisesRegexp() with assertRaisesRegex() Change-Id: I219c09184bfe73c633ef0ba073270a5b5d227659 --- .../tests/actions/test_baremetal.py | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tripleo_common/tests/actions/test_baremetal.py b/tripleo_common/tests/actions/test_baremetal.py index 9e7560a36..210e84f66 100644 --- a/tripleo_common/tests/actions/test_baremetal.py +++ b/tripleo_common/tests/actions/test_baremetal.py @@ -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)