[tests] do not allow assert_raises_message to be called with JSONRPCException

This commit is contained in:
John Newbery 2017-07-12 10:29:21 -04:00
parent 5864e9c161
commit 677d893ff7

View File

@ -51,6 +51,8 @@ def assert_raises(exc, fun, *args, **kwds):
def assert_raises_message(exc, message, fun, *args, **kwds): def assert_raises_message(exc, message, fun, *args, **kwds):
try: try:
fun(*args, **kwds) fun(*args, **kwds)
except JSONRPCException:
raise AssertionError("Use assert_raises_jsonrpc() to test RPC failures")
except exc as e: except exc as e:
if message is not None and message not in e.error['message']: if message is not None and message not in e.error['message']:
raise AssertionError("Expected substring not found:" + e.error['message']) raise AssertionError("Expected substring not found:" + e.error['message'])