aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-09-27 15:19:58 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-09-27 15:20:30 +0200
commit14e8f9916bebf01d3cd6fc89c704bd870bf50760 (patch)
tree1c09a18cf59172f78a3ff30a910776a9bd167124
parent920ca1f0bf0b786250e3119a05984e0c2af1350a (diff)
parent42f6aed731874d937d6f8c9f9c9a6b64d59852d8 (diff)
downloadbitcoin-14e8f9916bebf01d3cd6fc89c704bd870bf50760.tar.xz
Merge #8810: tests: Add exception error message for JSONRPCException
42f6aed tests: Add exception error message for JSONRPCException (Wladimir J. van der Laan)
-rw-r--r--qa/rpc-tests/test_framework/authproxy.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index d095a56ce7..f5e0be20d1 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -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