tests: update tox config and test scripts to support python 2.6

acobaugh · acobaugh · commit e21de35f21f3 · 2016-01-27T20:01:47.000-05:00
Define a new py26 env, and add unittest2 as a dependency
Add in some simple code that imports unittest2 as unittest if python &lt; 2.7
Fix some .format() calls to add the positional argument specifiers
diff --git a/influxdb/tests/__init__.py b/influxdb/tests/__init__.py
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
-import unittest
 import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 import os
 
 using_pypy = hasattr(sys, "pypy_version_info")
diff --git a/influxdb/tests/chunked_json_test.py b/influxdb/tests/chunked_json_test.py
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 
 from influxdb import chunked_json
 
diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py
@@ -19,13 +19,17 @@
 import requests.exceptions
 import socket
 import time
-import unittest
 import requests_mock
 import random
 from nose.tools import raises
 from mock import patch
 import warnings
 import mock
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    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
@@ -4,7 +4,11 @@
 """
 from .client_test import _mocked_session
 
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    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,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 import warnings
 
 import mock
@@ -117,7 +121,7 @@ def testSingleSeriesName(self):
         self.assertTrue(all([el in expectation for el in rcvd]) and
                         all([el in rcvd for el in expectation]),
                         'Invalid JSON body of time series returned from '
-                        '_json_body_ for one series name: {}.'.format(rcvd))
+                        '_json_body_ for one series name: {0}.'.format(rcvd))
         TestSeriesHelper.MySeriesHelper._reset_()
         self.assertEqual(
             TestSeriesHelper.MySeriesHelper._json_body_(),
@@ -183,7 +187,7 @@ def testSeveralSeriesNames(self):
         self.assertTrue(all([el in expectation for el in rcvd]) and
                         all([el in rcvd for el in expectation]),
                         'Invalid JSON body of time series returned from '
-                        '_json_body_ for several series names: {}.'
+                        '_json_body_ for several series names: {0}.'
                         .format(rcvd))
         TestSeriesHelper.MySeriesHelper._reset_()
         self.assertEqual(
@@ -245,7 +249,7 @@ class Meta:
                 # the warning only.
                 pass
             self.assertEqual(len(w), 1,
-                             '{} call should have generated one warning.'
+                             '{0} call should have generated one warning.'
                              .format(WarnBulkSizeZero))
             self.assertIn('forced to 1', str(w[-1].message),
                           'Warning message did not contain "forced to 1".')
@@ -267,7 +271,7 @@ class Meta:
             warnings.simplefilter("always")
             WarnBulkSizeNoEffect(time=159, server_name='us.east-1')
             self.assertEqual(len(w), 1,
-                             '{} call should have generated one warning.'
+                             '{0} call should have generated one warning.'
                              .format(WarnBulkSizeNoEffect))
             self.assertIn('has no affect', str(w[-1].message),
                           'Warning message did not contain "has not affect".')
diff --git a/influxdb/tests/influxdb08/client_test.py b/influxdb/tests/influxdb08/client_test.py
@@ -6,7 +6,11 @@
 import requests
 import requests.exceptions
 import socket
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 import requests_mock
 import random
 from nose.tools import raises
diff --git a/influxdb/tests/influxdb08/dataframe_client_test.py b/influxdb/tests/influxdb08/dataframe_client_test.py
@@ -4,7 +4,11 @@
 """
 from .client_test import _mocked_session
 
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    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,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 import warnings
 
 import mock
@@ -75,7 +79,7 @@ def testSingleSeriesName(self):
         self.assertTrue(all([el in expectation for el in rcvd]) and
                         all([el in rcvd for el in expectation]),
                         'Invalid JSON body of time series returned from '
-                        '_json_body_ for one series name: {}.'.format(rcvd))
+                        '_json_body_ for one series name: {0}.'.format(rcvd))
         TestSeriesHelper.MySeriesHelper._reset_()
         self.assertEqual(
             TestSeriesHelper.MySeriesHelper._json_body_(),
diff --git a/influxdb/tests/resultset_test.py b/influxdb/tests/resultset_test.py
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 
 from influxdb.exceptions import InfluxDBClientError
 from influxdb.resultset import ResultSet
diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py
@@ -15,7 +15,11 @@
 from functools import partial
 import os
 import time
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 import warnings
 
 # By default, raise exceptions on warnings
diff --git a/influxdb/tests/server_tests/influxdb_instance.py b/influxdb/tests/server_tests/influxdb_instance.py
@@ -9,11 +9,30 @@
 import time
 import shutil
 import subprocess
-import unittest
 import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 
 from influxdb.tests.misc import is_port_open, get_free_ports
 
+# hack in check_output if it's not defined, like for python 2.6
+if "check_output" not in dir( subprocess ): 
+    def f(*popenargs, **kwargs):
+        if 'stdout' in kwargs:
+            raise ValueError('stdout argument not allowed, it will be overridden.')
+        process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
+        output, unused_err = process.communicate()
+        retcode = process.poll()
+        if retcode:
+            cmd = kwargs.get("args")
+            if cmd is None:
+                cmd = popenargs[0]
+            raise subprocess.CalledProcessError(retcode, cmd)
+        return output
+    subprocess.check_output = f
+
 
 class InfluxDbInstance(object):
     """ A class to launch of fresh influxdb server instance
diff --git a/influxdb/tests/test_line_protocol.py b/influxdb/tests/test_line_protocol.py
@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
 
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
+
 from influxdb import line_protocol
 
 
diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
-envlist = py34, py27, pypy, flake8
+envlist = py34, py27, py26, pypy, flake8
 
 [testenv]
 passenv = INFLUXDB_PYTHON_INFLUXD_PATH
 setenv = INFLUXDB_PYTHON_SKIP_SERVER_TESTS=False
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       py27,py32,py33,py34: pandas
+       py27,py32,py33,py34,py26: pandas
+       py26: unittest2
 # Only install pandas with non-pypy interpreters
 commands = nosetests -v --with-doctest {posargs}
 
