Test suite improvements (#333) (Thanks @BABILEN!)

wwentland · aviau · commit 68c95e5c0df3 · 2016-06-13T09:50:44.000-04:00
* Import py3 compatibility future statements

* Consistent formatting for dictionary literals

This makes it easier to see changes to test data in diffs.

* Add 'shardGroupDuration' in retention policy tests

This information was introduced in InfluxDB 0.10.0 and tests fail
without it.

* Perform correct default retention policy switching

There can only be a single default retention policy per database.

* Update InfluxDB version to 0.13.0

This will run tests on travis using 0.13.0

* travis: upgrade wget

* Drop Python 2.6 support

This removes tests and compatibility code for Python 2.6.

* Fix PEP8 errors
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: python
+addons:
+  apt:
+    packages:
+    - wget
 env:
-#    - TOX_ENV=py26
-# If someone opens a PR to re-enable py26 tests, I will merge it.
-# However, that cannot be at the cost of disabling pandas tests in other
-# environments.
     - TOX_ENV=py27
 #    - TOX_ENV=py32
 # Disabling py32 tests until the following issue is fixed:
@@ -20,7 +20,7 @@ install:
     - pip install tox
     - pip install coveralls
     - mkdir influxdb_install
-    - wget https://s3.amazonaws.com/influxdb/influxdb_0.12.1-1_amd64.deb
+    - wget https://dl.influxdata.com/influxdb/releases/influxdb_0.13.0_amd64.deb
     - dpkg -x influxdb*.deb influxdb_install
 script:
     - export INFLUXDB_PYTHON_INFLUXD_PATH=$(pwd)/influxdb_install/usr/bin/influxd
diff --git a/influxdb/__init__.py b/influxdb/__init__.py
@@ -1,4 +1,10 @@
 # -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from .client import InfluxDBClient
 from .client import InfluxDBClusterClient
 from .dataframe_client import DataFrameClient
diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py
@@ -2,6 +2,11 @@
 """
 DataFrame client for InfluxDB
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import math
 
 import pandas as pd
diff --git a/influxdb/chunked_json.py b/influxdb/chunked_json.py
@@ -5,6 +5,11 @@
 # Source: https://gist.github.com/sampsyo/920215
 #
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import json
 
 _decoder = json.JSONDecoder()
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -2,6 +2,10 @@
 """
 Python client for InfluxDB
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 from functools import wraps
 import json
diff --git a/influxdb/dataframe_client.py b/influxdb/dataframe_client.py
@@ -2,6 +2,10 @@
 """
 DataFrame client for InfluxDB
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 __all__ = ['DataFrameClient']
 
diff --git a/influxdb/exceptions.py b/influxdb/exceptions.py
@@ -1,3 +1,9 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+
 class InfluxDBClientError(Exception):
     """Raised when an error occurs in the request."""
     def __init__(self, content, code=None):
diff --git a/influxdb/helper.py b/influxdb/helper.py
@@ -2,6 +2,11 @@
 """
 Helper class for InfluxDB
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from collections import namedtuple, defaultdict
 from datetime import datetime
 from warnings import warn
diff --git a/influxdb/influxdb08/__init__.py b/influxdb/influxdb08/__init__.py
@@ -1,4 +1,10 @@
 # -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from .client import InfluxDBClient
 from .dataframe_client import DataFrameClient
 from .helper import SeriesHelper
diff --git a/influxdb/influxdb08/chunked_json.py b/influxdb/influxdb08/chunked_json.py
@@ -5,6 +5,11 @@
 # Source: https://gist.github.com/sampsyo/920215
 #
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import json
 
 _decoder = json.JSONDecoder()
diff --git a/influxdb/influxdb08/dataframe_client.py b/influxdb/influxdb08/dataframe_client.py
@@ -2,6 +2,11 @@
 """
 DataFrame client for InfluxDB
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import math
 import warnings
 
diff --git a/influxdb/influxdb08/helper.py b/influxdb/influxdb08/helper.py
@@ -2,6 +2,11 @@
 """
 Helper class for InfluxDB
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from collections import namedtuple, defaultdict
 from warnings import warn
 
diff --git a/influxdb/line_protocol.py b/influxdb/line_protocol.py
@@ -1,4 +1,8 @@
 # -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 from calendar import timegm
diff --git a/influxdb/resultset.py b/influxdb/resultset.py
@@ -1,5 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import warnings
 
 from influxdb.exceptions import InfluxDBClientError
diff --git a/influxdb/tests/__init__.py b/influxdb/tests/__init__.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import sys
 import os
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+
+import unittest
 
 using_pypy = hasattr(sys, "pypy_version_info")
 skipIfPYpy = unittest.skipIf(using_pypy, "Skipping this test on pypy.")
diff --git a/influxdb/tests/chunked_json_test.py b/influxdb/tests/chunked_json_test.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
-import sys
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 from influxdb import chunked_json
 
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 
 class TestChunkJson(unittest.TestCase):
diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py
@@ -14,6 +14,11 @@
 See client_test_with_server.py for tests against a running server instance.
 
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import json
 import requests
 import requests.exceptions
@@ -25,11 +30,7 @@
 from mock import patch
 import warnings
 import mock
-import sys
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from influxdb import InfluxDBClient, InfluxDBClusterClient
 from influxdb.client import InfluxDBServerError
diff --git a/influxdb/tests/dataframe_client_test.py b/influxdb/tests/dataframe_client_test.py
@@ -2,13 +2,14 @@
 """
 unit tests for misc module
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from .client_test import _mocked_session
 
-import sys
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 import json
 import requests_mock
 from nose.tools import raises
diff --git a/influxdb/tests/helper_test.py b/influxdb/tests/helper_test.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
-import sys
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import unittest
 import warnings
 
 import mock
diff --git a/influxdb/tests/influxdb08/client_test.py b/influxdb/tests/influxdb08/client_test.py
@@ -7,10 +7,7 @@
 import requests.exceptions
 import socket
 import sys
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 import requests_mock
 import random
 from nose.tools import raises
@@ -21,7 +18,6 @@
 from influxdb.influxdb08 import InfluxDBClient
 from influxdb.influxdb08.client import session
 
-import sys
 if sys.version < '3':
     import codecs
 
diff --git a/influxdb/tests/influxdb08/dataframe_client_test.py b/influxdb/tests/influxdb08/dataframe_client_test.py
@@ -4,11 +4,7 @@
 """
 from .client_test import _mocked_session
 
-import sys
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 import json
 import requests_mock
 from nose.tools import raises
diff --git a/influxdb/tests/influxdb08/helper_test.py b/influxdb/tests/influxdb08/helper_test.py
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import sys
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 import warnings
 
 import mock
diff --git a/influxdb/tests/misc.py b/influxdb/tests/misc.py
@@ -1,5 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import socket
 
 
diff --git a/influxdb/tests/resultset_test.py b/influxdb/tests/resultset_test.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
-import sys
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import unittest
 
 from influxdb.exceptions import InfluxDBClientError
 from influxdb.resultset import ResultSet
diff --git a/influxdb/tests/server_tests/base.py b/influxdb/tests/server_tests/base.py
@@ -1,5 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import sys
 
 from influxdb.tests import using_pypy
diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py
diff --git a/influxdb/tests/server_tests/influxdb_instance.py b/influxdb/tests/server_tests/influxdb_instance.py
diff --git a/influxdb/tests/test_line_protocol.py b/influxdb/tests/test_line_protocol.py
diff --git a/tox.ini b/tox.ini
