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

Github-Pull: #10853 Rebased-From: 677d893ff758b61f66203730da224bd7ef8f0b43
2017-07-12 10:29:21 -04:00 · 2017-07-12 10:29:21 -04:00 · 623de0acbb
commit 623de0acbb
parent 5b728c8e98
1 changed files with 2 additions and 0 deletions
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@ -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'])