fix some attributes in the except for ConnectionError/Timeout and cre…

…ate a test to be sure it works

esipy/client.py

@@ -103,14 +103,10 @@ def _retry_request(self, req_and_resp, _retry=0, **kwargs):
             res = self._request(req_and_resp, **kwargs)
         except (RequestsConnectionError, Timeout) as e:
             req, res = req_and_resp
-            res.status = 500
+            res._Response__status = 500
             # request__path is the same as response, and is always set
             res._Response__path = req._Request__path
-
-            try:
-                res.data = e.message.message
-            except AttributeError:
-                res.data = ""
+            res._Response__data = str(e)
 
         if 500 <= res.status <= 599:
             _retry += 1

test/test_client.py

@@ -15,6 +15,7 @@
 from esipy.cache import DummyCache
 
 from requests.adapters import HTTPAdapter
+from requests.exceptions import ConnectionError
 
 import httmock
 import mock
@@ -223,3 +224,23 @@ def test_esipy_backoff(self):
 
         # Check that backoff slept for a sum > 2 seconds
         self.assertTrue(end_calls - start_calls > 2)
+
+    def test_esipy_timeout(self):
+        def send_function(*args, **kwargs):
+            """ manually create a ConnectionError to test the retry and be sure
+            no exception is thrown """
+            send_function.count += 1
+            raise ConnectionError
+        send_function.count = 0
+
+        self.client_no_auth._session.send = mock.MagicMock(
+            side_effect=send_function
+        )
+
+        operation = self.app.op['get_incursions']()
+        with httmock.HTTMock(public_incursion):
+            incursions = self.client_no_auth.request(operation)
+            # there shouldn't be any exceptions
+
+        self.assertEqual(incursions.status, 500)
+        self.assertEqual(send_function.count, 5)