openstack
/
senlin
Code Issues Proposed changes

Replace deprecated assertRaisesRegexp 

The assertRaisesRegexp method has been deprecated since it was renamed
to assertRaisesRegex in Python 3.2 .

https: //docs.python.org/3/library/unittest.html#deprecated-aliases
Change-Id: I9b6e6283301dfb6d1874b81bb5f26db56568bd5a
This commit is contained in:
wu.shiming 2021-11-08 14:21:51 +08:00
parent 67b56c1791
commit 479e5ca8f9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
senlin/tests/unit/engine/actions/test_action_base.py
View File

@ -285,8 +285,8 @@ class ActionBaseTest(base.SenlinTestCase):
error_message = (
'CLUSTER_CREATE for cluster \'{}\' cannot be completed because '
'it is already locked.').format(OBJID)
with self.assertRaisesRegexp(exception.ResourceIsLocked,
error_message):
with self.assertRaisesRegex(exception.ResourceIsLocked,
error_message):
ab.Action.create(self.ctx, OBJID, 'CLUSTER_CREATE', name='test')
mock_store.assert_not_called()
@ -336,8 +336,8 @@ class ActionBaseTest(base.SenlinTestCase):
error_message = (
'NODE_CREATE for node \'{}\' cannot be completed because '
'it is already locked.').format(OBJID)
with self.assertRaisesRegexp(exception.ResourceIsLocked,
error_message):
with self.assertRaisesRegex(exception.ResourceIsLocked,
error_message):
ab.Action.create(self.ctx, OBJID, 'NODE_CREATE', name='test')
mock_store.assert_not_called()
@ -356,8 +356,8 @@ class ActionBaseTest(base.SenlinTestCase):
error_message = (
'The NODE_CREATE action for target {} conflicts with the following'
' action\(s\): {},{}').format(OBJID, uuid1, uuid2)
with self.assertRaisesRegexp(exception.ActionConflict,
error_message):
with self.assertRaisesRegex(exception.ActionConflict,
error_message):
ab.Action.create(self.ctx, OBJID, 'NODE_CREATE', name='test')
mock_store.assert_not_called()