diff options
author | Russell Yanofsky <russ@yanofsky.org> | 2016-11-02 15:08:54 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2016-11-19 23:21:19 +0100 |
commit | da4926b1d28c600076d3eb35df60981298194697 (patch) | |
tree | 06ecdb31520f0b6d4961654f3360d48ac14a25a7 /qa | |
parent | 1d4c884cd325150c68b8b129e4dc18a933866509 (diff) | |
download | bitcoin-da4926b1d28c600076d3eb35df60981298194697.tar.xz |
[qa] Add more helpful RPC timeout message
Replace previous timeout('timed out',) exception with more detailed error.
Github-Pull: #9077
Rebased-From: e89614b6abf28d7fe201c3db44a0df6e4db6de03
Diffstat (limited to 'qa')
-rw-r--r-- | qa/rpc-tests/test_framework/authproxy.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py index 1a94bf5fe9..7b051545c8 100644 --- a/qa/rpc-tests/test_framework/authproxy.py +++ b/qa/rpc-tests/test_framework/authproxy.py @@ -42,6 +42,7 @@ import base64 import decimal import json import logging +import socket try: import urllib.parse as urlparse except ImportError: @@ -157,7 +158,15 @@ class AuthServiceProxy(object): return self._request('POST', self.__url.path, postdata.encode('utf-8')) def _get_response(self): - http_response = self.__conn.getresponse() + try: + http_response = self.__conn.getresponse() + except socket.timeout as e: + raise JSONRPCException({ + 'code': -344, + 'message': '%r RPC took longer than %f seconds. Consider ' + 'using larger timeout for calls that take ' + 'longer to return.' % (self._service_name, + self.__conn.timeout)}) if http_response is None: raise JSONRPCException({ 'code': -342, 'message': 'missing HTTP response from server'}) |