Merge "Replace assertRaisesRegexp with assertRaisesRegex"

This commit is contained in:
Zuul 2018-09-06 11:22:20 +00:00 committed by Gerrit Code Review
commit 8473e2e373

View File

@ -174,11 +174,11 @@ class TestElementDeps(testtools.TestCase):
def test_elements_provide_same(self): def test_elements_provide_same(self):
msg = "virtual: already provided by \['provides_virtual'\]" msg = "virtual: already provided by \['provides_virtual'\]"
self.assertRaisesRegexp(element_dependencies.AlreadyProvidedException, self.assertRaisesRegex(element_dependencies.AlreadyProvidedException,
msg, msg,
element_dependencies.get_elements, element_dependencies.get_elements,
['provides_virtual', 'also_provides_virtual'], ['provides_virtual', 'also_provides_virtual'],
self.element_dirs) self.element_dirs)
def test_no_os_element(self): def test_no_os_element(self):
self.assertRaises(element_dependencies.MissingOSException, self.assertRaises(element_dependencies.MissingOSException,