Change assertRaises to assertRaisesRegex in test_xmlrpc (#481) (#674)

(cherry picked from commit c6b448b36d)
This commit is contained in:
Berker Peksag 2017-03-15 14:12:53 +03:00 committed by GitHub
parent 02c6fa573a
commit 78add3309b

View file

@ -412,7 +412,7 @@ class SimpleXMLRPCDispatcherTestCase(unittest.TestCase):
dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher() dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher()
dispatcher.register_function(None, name='method') dispatcher.register_function(None, name='method')
with self.assertRaises(Exception, expected_regex='method'): with self.assertRaisesRegex(Exception, 'method'):
dispatcher._dispatch('method', ('param',)) dispatcher._dispatch('method', ('param',))
def test_instance_has_no_func(self): def test_instance_has_no_func(self):
@ -420,14 +420,14 @@ class SimpleXMLRPCDispatcherTestCase(unittest.TestCase):
dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher() dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher()
dispatcher.register_instance(object()) dispatcher.register_instance(object())
with self.assertRaises(Exception, expected_regex='method'): with self.assertRaisesRegex(Exception, 'method'):
dispatcher._dispatch('method', ('param',)) dispatcher._dispatch('method', ('param',))
def test_cannot_locate_func(self): def test_cannot_locate_func(self):
"""Calls a function that the dispatcher cannot locate""" """Calls a function that the dispatcher cannot locate"""
dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher() dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher()
with self.assertRaises(Exception, expected_regex='method'): with self.assertRaisesRegex(Exception, 'method'):
dispatcher._dispatch('method', ('param',)) dispatcher._dispatch('method', ('param',))