[qa] Add more helpful RPC timeout message

ryanofsky · MarcoFalke · commit da4926b1d28c · 2016-11-19T23:21:19.000+01:00
Replace previous timeout('timed out',) exception with more detailed error. Github-Pull: bitcoin#9077 Rebased-From: e89614b
diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
@@ -42,6 +42,7 @@
 import decimal
 import json
 import logging
+import socket
 try:
     import urllib.parse as urlparse
 except ImportError:
@@ -157,7 +158,15 @@ def _batch(self, rpc_call_list):
         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'})
