Merge #8810: tests: Add exception error message for JSONRPCException

42f6aed tests: Add exception error message for JSONRPCException (Wladimir J. van der Laan)
8 years ago · 14e8f9916b
1 changed files with 5 additions and 1 deletions
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@ -55,7 +55,11 @@ log = logging.getLogger("BitcoinRPC")
				@@ -55,7 +55,11 @@ log = logging.getLogger("BitcoinRPC")

 class JSONRPCException(Exception):
    def __init__(self, rpc_error):
-        Exception.__init__(self)
+        try:
+            errmsg = '%(message)s (%(code)i)' % rpc_error
+        except (KeyError, TypeError):
+            errmsg = ''
+        Exception.__init__(self, errmsg)
        self.error = rpc_error