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

Github-Pull: #10853
Rebased-From: 677d893ff7
This commit is contained in:
John Newbery 2017-07-12 10:29:21 -04:00 committed by MarcoFalke
parent 5b728c8e98
commit 623de0acbb
1 changed files with 2 additions and 0 deletions

View File

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