openstack
/
deb-congress
Code Issues Proposed changes

Replace assertRaisesRegexp with assertRaisesRegex 

assertRaisesRegexp was renamed to assertRaisesRegex in Py3.2
For more details, please check:
https://docs.python.org/3/library/
unittest.html#unittest.TestCase.assertRaisesRegex

Change-Id: Ied395e2c7bff32a4108ac3194f88249e0f2a1760
Closes-Bug: #1436957
This commit is contained in:
Vu Cong Tuan 2017-06-03 13:19:56 +07:00 committed by Eric Kao
parent 7553d89db2
commit baecc5d5de
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
congress/tests/api/test_policy_model.py
View File

@ -85,10 +85,10 @@ class TestPolicyModel(base.SqlTestCase):
self.assertEqual(expected_ret, ret)
def test_get_invalid_item(self):
self.assertRaisesRegexp(webservice.DataModelException,
'^Not Found',
self.policy_model.get_item,
'invalid-id', {})
self.assertRaisesRegex(webservice.DataModelException,
'^Not Found',
self.policy_model.get_item,
'invalid-id', {})
@mock.patch('oslo_utils.uuidutils.generate_uuid')
def test_add_item(self, patched_gen_uuid):
@ -159,10 +159,10 @@ class TestPolicyModel(base.SqlTestCase):
ret = self.policy_model.delete_item(policy_id, {})
self.assertEqual(expected_ret, ret)
self.assertRaisesRegexp(webservice.DataModelException,
'^Not Found',
self.policy_model.get_item,
self.policy['id'], {})
self.assertRaisesRegex(webservice.DataModelException,
'^Not Found',
self.policy_model.get_item,
self.policy['id'], {})
# check that deleting the policy also deletes the rules
self.assertRaises(webservice.DataModelException,