Merge branch 'master' into master

xginn8 · web-flow · commit b77a7a2e39de · 2017-10-30T08:10:43.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,7 @@ matrix:
 
 install:
     - pip install tox
+    - pip install setuptools==20.6.6
     - pip install coveralls
     - mkdir influxdb_install
     - wget https://dl.influxdata.com/influxdb/releases/influxdb_1.2.4_amd64.deb
diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py
@@ -86,7 +86,7 @@ def write_points(self,
 
                 if protocol == 'line':
                     points = self._convert_dataframe_to_lines(
-                        dataframe.ix[start_index:end_index].copy(),
+                        dataframe.iloc[start_index:end_index].copy(),
                         measurement=measurement,
                         global_tags=tags,
                         time_precision=time_precision,
@@ -95,7 +95,7 @@ def write_points(self,
                         numeric_precision=numeric_precision)
                 else:
                     points = self._convert_dataframe_to_json(
-                        dataframe.ix[start_index:end_index].copy(),
+                        dataframe.iloc[start_index:end_index].copy(),
                         measurement=measurement,
                         tags=tags,
                         time_precision=time_precision,
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -7,6 +7,8 @@
 from __future__ import unicode_literals
 
 from sys import version_info
+import time
+import random
 
 import json
 import socket
@@ -237,6 +239,7 @@ def request(self, url, method='GET', params=None, data=None,
         _try = 0
         while retry:
             try:
+                _error = False
                 response = self._session.request(
                     method=method,
                     url=url,
@@ -249,20 +252,27 @@ def request(self, url, method='GET', params=None, data=None,
                     timeout=self._timeout
                 )
                 break
-            except requests.exceptions.ConnectionError:
+            except (requests.exceptions.ConnectionError,
+                    requests.exceptions.HTTPError,
+                    requests.exceptions.Timeout) as _e:
+                _error = _e
                 _try += 1
                 if self._retries != 0:
                     retry = _try < self._retries
-
-        else:
-            raise requests.exceptions.ConnectionError
-
-        if 500 <= response.status_code < 600:
-            raise InfluxDBServerError(response.content)
-        elif response.status_code == expected_response_code:
-            return response
+                if method == "POST":
+                    time.sleep((2 ** _try) * random.random() / 100.0)
+        if _error:
+            raise(_error)
         else:
-            raise InfluxDBClientError(response.content, response.status_code)
+            # if there's not an error, there must have been a successful
+            # response
+            if 500 <= response.status_code < 600:
+                raise InfluxDBServerError(response.content)
+            elif response.status_code == expected_response_code:
+                return response
+            else:
+                raise InfluxDBClientError(response.content,
+                                          response.status_code)
 
     def write(self, data, params=None, expected_response_code=204,
               protocol='json'):
diff --git a/influxdb/influxdb08/dataframe_client.py b/influxdb/influxdb08/dataframe_client.py
@@ -59,7 +59,7 @@ def write_points(self, data, *args, **kwargs):
                         self._convert_dataframe_to_json(
                             name=key,
                             dataframe=data_frame
-                            .ix[start_index:end_index].copy(),
+                            .iloc[start_index:end_index].copy(),
                             time_precision=time_precision)]
                     InfluxDBClient.write_points(self, outdata, *args, **kwargs)
             return True
diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py
@@ -686,7 +686,7 @@ def connection_error(self, *args, **kwargs):
 
     @mock.patch('requests.Session.request')
     def test_request_retry_raises(self, mock_request):
-        """Test that three connection errors will not be handled."""
+        """Test that three requests errors will not be handled."""
         class CustomMock(object):
             """Create custom mock object for test."""
 
@@ -698,7 +698,7 @@ def connection_error(self, *args, **kwargs):
                 self.i += 1
 
                 if self.i < 4:
-                    raise requests.exceptions.ConnectionError
+                    raise requests.exceptions.HTTPError
                 else:
                     r = requests.Response()
                     r.status_code = 200
@@ -708,7 +708,7 @@ def connection_error(self, *args, **kwargs):
 
         cli = InfluxDBClient(database='db')
 
-        with self.assertRaises(requests.exceptions.ConnectionError):
+        with self.assertRaises(requests.exceptions.HTTPError):
             cli.write_points(self.dummy_points)
 
     @mock.patch('requests.Session.request')
@@ -732,7 +732,7 @@ def connection_error(self, *args, **kwargs):
                     r.status_code = 204
                     return r
 
-        retries = random.randint(1, 100)
+        retries = random.randint(1, 5)
         mock_request.side_effect = CustomMock(retries).connection_error
 
         cli = InfluxDBClient(database='db', retries=retries)
@@ -759,7 +759,7 @@ def connection_error(self, *args, **kwargs):
                     r.status_code = 200
                     return r
 
-        retries = random.randint(1, 100)
+        retries = random.randint(1, 5)
         mock_request.side_effect = CustomMock(retries).connection_error
 
         cli = InfluxDBClient(database='db', retries=retries)
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,4 +1,4 @@
 nose
 nose-cov
 mock
-requests-mock
+requests-mock
