When gateway sends failure response, include text in raised exception

etcd3gw/client.py

@@ -83,7 +83,7 @@ def post(self, *args, **kwargs):
             if resp.status_code in _EXCEPTIONS_BY_CODE:
                 raise _EXCEPTIONS_BY_CODE[resp.status_code](resp.reason)
             if resp.status_code != requests.codes['ok']:
-                raise exceptions.Etcd3Exception(resp.reason)
+                raise exceptions.Etcd3Exception(resp.reason, resp.text)
         except requests.exceptions.Timeout as ex:
             raise exceptions.ConnectionTimeoutError(six.text_type(ex))
         except requests.exceptions.ConnectionError as ex:

etcd3gw/exceptions.py

@@ -12,7 +12,9 @@
 
 
 class Etcd3Exception(Exception):
-    pass
+    def __init__(self, msg, detail_text=None):
+        super(Etcd3Exception, self).__init__(msg)
+        self.detail_text = detail_text
 
 
 class WatchTimedOut(Etcd3Exception):

etcd3gw/tests/test_client.py

@@ -10,7 +10,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import mock
+
 from etcd3gw.client import Etcd3Client
+from etcd3gw.exceptions import Etcd3Exception
 from etcd3gw.tests import base
 
 
@@ -30,3 +33,24 @@ def test_client_ipv6(self):
         client = Etcd3Client(host="::1")
         self.assertEqual("http://[::1]:2379/v3alpha/lease/grant",
                          client.get_url("/lease/grant"))
+
+    def test_client_bad_request(self):
+        client = Etcd3Client(host="127.0.0.1")
+        with mock.patch.object(client, "session") as mock_session:
+            mock_response = mock.Mock()
+            mock_response.status_code = 400
+            mock_response.reason = "Bad Request"
+            mock_response.text = '''{
+"error": "etcdserver: mvcc: required revision has been compacted",
+"code": 11
+}'''
+            mock_session.post.return_value = mock_response
+            try:
+                client.status()
+                self.assertFalse(True)
+            except Etcd3Exception as e:
+                self.assertEqual(str(e), "Bad Request")
+                self.assertEqual(e.detail_text, '''{
+"error": "etcdserver: mvcc: required revision has been compacted",
+"code": 11
+}''')