Merge pull request #243 from ehdsouza/master

Generic error handling for 4xx when the response is plaintext

Author: germanattanasio

.travis.yml

@@ -15,6 +15,7 @@ install:
 - pip install pylint
 - pip install codecov
 - pip install git+git://github.com/watson-developer-cloud/python-sdk.git#egg=watson-developer-cloud
+- pip show six
 script:
 - sh pylint.sh
 - py.test test --cov=watson_developer_cloud

test/test_conversation_v1.py

@@ -15,6 +15,7 @@
 import json
 import responses
 import watson_developer_cloud
+from watson_developer_cloud import WatsonException
 
 platform_url = 'https://gateway.watsonplatform.net'
 service_path = '/conversation/api'
@@ -48,6 +49,46 @@ def test_create_counterexample():
     assert responses.calls[0].request.url.startswith(url)
     assert counterexample == response
 
+@responses.activate
+def test_rate_limit_exceeded():
+    endpoint = '/v1/workspaces/{0}/counterexamples'.format('boguswid')
+    url = '{0}{1}'.format(base_url, endpoint)
+    error_code = "'code': '407'"
+    error_msg = 'Rate limit exceeded'
+    responses.add(
+        responses.POST,
+        url,
+        body='Rate limit exceeded',
+        status=407,
+        content_type='application/json')
+    service = watson_developer_cloud.ConversationV1(
+        username='username', password='password', version='2017-02-03')
+    try:
+        service.create_counterexample(
+            workspace_id='boguswid', text='I want financial advice today.')
+    except WatsonException as ex:
+        assert len(responses.calls) == 1
+        assert error_code in str(ex)
+        assert error_msg in str(ex)
+
+@responses.activate
+def test_unknown_error():
+    endpoint = '/v1/workspaces/{0}/counterexamples'.format('boguswid')
+    url = '{0}{1}'.format(base_url, endpoint)
+    error_msg = 'Unknown error'
+    responses.add(
+        responses.POST,
+        url,
+        status=407,
+        content_type='application/json')
+    service = watson_developer_cloud.ConversationV1(
+        username='username', password='password', version='2017-02-03')
+    try:
+        service.create_counterexample(
+            workspace_id='boguswid', text='I want financial advice today.')
+    except WatsonException as ex:
+        assert len(responses.calls) == 1
+        assert error_msg in str(ex)
 
 @responses.activate
 def test_delete_counterexample():

watson_developer_cloud/watson_developer_cloud_service.py

@@ -190,9 +190,10 @@ def _get_error_message(response):
             if 'description' in error_json:
                 error_message += ', Description: ' + error_json['description']
             error_message += ', Code: ' + str(response.status_code)
+            return error_message
         except:
-            pass
-        return error_message
+            return {'error': response.text or error_message, 'code': str(response.status_code)}
+
 
     def _alchemy_html_request(self, method_name=None, url=None, html=None,
                               text=None, params=None, method='POST',