Clean-up sapi request code a little bit

dwave/cloud/client.py

@@ -1658,7 +1658,8 @@ def _sapi_request(meth, *args, **kwargs):
             dict: JSON decoded body
 
         Raises:
-            A :class:`~dwave.cloud.exceptions.SAPIError` subclass.
+            A :class:`~dwave.cloud.exceptions.SAPIError` subclass, or
+            :class:`dwave.cloud.exceptions.RequestTimeout`
         """
 
         caller = inspect.stack()[1].function
@@ -1696,15 +1697,14 @@ def _sapi_request(meth, *args, **kwargs):
                 raise SolverAuthenticationError(error_code=401)
 
             try:
-                error_msg = response.json()['error_msg']
+                msg = response.json()
+                error_msg = msg['error_msg']
+                error_code = msg['error_code']
             except:
                 error_msg = response.text
-
-            try:
-                error_code = response.json()['error_code']
-            except:
                 error_code = response.status_code
 
+            # NOTE: for backwards compat only. Change to: SAPIError
             raise SolverError(error_msg=error_msg, error_code=error_code)
 
     @staticmethod

dwave/cloud/exceptions.py

@@ -89,7 +89,7 @@ def __init__(self):
         super(CanceledFutureError, self).__init__("An error occurred reading results from a canceled request")
 
 
-class InvalidAPIResponseError(Exception):
+class InvalidAPIResponseError(SAPIError):
     """Raised when an invalid/unexpected response from D-Wave Solver API is received."""
 
 

tests/test_client.py

@@ -523,7 +523,7 @@ def test_http_retry_params_from_kwargs(self):
                 self._verify_retry_config(retry, retry_kwargs)
 
 
-class MockConfigClientIntegration(unittest.TestCase):
+class ClientConfigIntegration(unittest.TestCase):
 
     def test_custom_options(self):
         """Test custom options (request_timeout, polling_timeout, permissive_ssl)