Improved error handling

Author: magnuswatn

test_wls_rest_python.py

@@ -264,6 +264,23 @@ def test_wls_handle_error_400():
     with pytest.raises(wls_rest_python.BadRequestException, match='insert detail here'):
         wls_rest_python.WLS._handle_error(response)
 
+def test_wls_handle_error_400_with_alternative_json():
+    response = MagicMock()
+    response.status_code = 400
+    response.json = MagicMock(return_value={
+        u'status': 400,
+        u'wls:errorsDetails': [
+            {
+                u'o:errorPath': u'machine',
+                u'type': u'http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.1',
+                u'detail': u'Type mismatch. Cannot convert hei to weblogic.management.configuration.MachineMBean.',
+                u'title': u'FAILURE'
+            }
+        ],
+        u'type': u'http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.1',
+        u'title': u'ERRORS'})
+    with pytest.raises(wls_rest_python.BadRequestException, match='Type mismatch'):
+        wls_rest_python.WLS._handle_error(response)
 
 def test_wls_handle_error_401():
     response = MagicMock()
@@ -342,9 +359,9 @@ def test_wls_handle_error_503():
 def test_wls_handle_unknown_error():
     response = MagicMock()
     response.status_code = 507
-    response.json = MagicMock(return_value={'detail': 'whaat'})
+    response.json = MagicMock(return_value={'detail': 'Weird error'})
     with pytest.raises(
-        wls_rest_python.WLSException, match='An unknown error occured. Got status code: 507'
+        wls_rest_python.WLSException, match='Weird error'
     ):
         wls_rest_python.WLS._handle_error(response)
 

wls_rest_python.py

@@ -195,39 +195,43 @@ def _handle_response(self, response):
 
     @staticmethod
     def _handle_error(response):
+
+        exception_type = WLSException
+        exception_message = 'An unknown error occured.'
+
         if response.status_code == 400:
-            raise BadRequestException(response.json()['detail'])
+            exception_type = BadRequestException
 
         if response.status_code == 401:
             # does not return json
             raise UnauthorizedException()
 
         if response.status_code == 403:
-            raise ForbiddenException(response.json()['detail'])
+            exception_type = ForbiddenException
 
         if response.status_code == 404:
-            raise NotFoundException(response.json()['detail'])
+            exception_type = NotFoundException
 
         if response.status_code == 405:
-            raise MethodNotAllowedException(response.json()['detail'])
+            exception_type = MethodNotAllowedException
 
         if response.status_code == 406:
-            raise NotAcceptableException(response.json()['detail'])
+            exception_type = NotAcceptableException
 
         if response.status_code == 500:
-            # may not return json...
-            try:
-                raise ServerErrorException(response.json()['detail'])
-            except ValueError:
-                pass
-            raise ServerErrorException(response.text)
+            exception_type = ServerErrorException
 
         if response.status_code == 503:
-            raise ServiceUnavailableException(response.json()['detail'])
+            exception_type = ServiceUnavailableException
 
-        raise WLSException(
-            'An unknown error occured. Got status code: {}'.format(response.status_code)
-        )
+        try:
+            exception_message = response.json()['detail']
+        except KeyError:
+            exception_message = response.json()
+        except ValueError:
+            exception_message = response.text
+
+        raise exception_type(exception_message)
 
 
 class WLSObject(object):