tests: fix support for 2.6

also add python 3.4 to travis.yml

Author: Steven Kryskalla

.travis.yml

@@ -4,10 +4,11 @@ python:
   - "2.6"
   - "2.7"
   - "3.3"
+  - "3.4"
 
 install:
   - "python setup.py install"
 
 script: make test
 
-services: redis
+services: redis

run_tests.py

@@ -1,16 +1,18 @@
 #!/usr/bin/env python
 
 import sys
+import platform
 from subprocess import Popen, PIPE, STDOUT
 
 def main():
     if Popen(['redis-cli', 'info'], stdout=PIPE).wait() != 0:
         raise RuntimeError("Redis server is not running.")
 
     pipe = "rg" if Popen(['which', 'rg'], stdout=PIPE).wait() == 0 else "cat"
+    module = "discover" if platform.python_version() < '2.7' else 'unittest discover'
 
     #run tests and gather output
-    p = Popen("/usr/bin/env python -m unittest discover -v -s tests %s" % " ".join(sys.argv[1:]), shell=True, stdout=PIPE, stderr=STDOUT)
+    p = Popen("/usr/bin/env python -m %s -v -s tests %s" % (module, " ".join(sys.argv[1:])), shell=True, stdout=PIPE, stderr=STDOUT)
     exit_code = p.wait()
     (out, _) = p.communicate()
 

setup.py

@@ -1,5 +1,10 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup
+import platform
+
+tests_require = []
+if platform.python_version() < '2.7':
+    tests_require.append('discover==0.4.0')
 
 setup(
     name='rq-scheduler',
@@ -18,7 +23,8 @@
     rqscheduler = rq_scheduler.scripts.rqscheduler:main
     ''',
     package_data = { '': ['README.rst'] },
-    install_requires=['rq>=0.3.5'],
+    tests_require=tests_require,
+    install_requires=['rq>=0.3.5'] + tests_require,
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Environment :: Console',

tests/__init__.py

@@ -47,10 +47,29 @@ def tearDown(self):
         def assertIsNotNone(self, value, *args):
             self.assertNotEqual(value, None, *args)
 
+    # Implement assertIn for Python runtimes < 2.7 or < 3.1
+    if not hasattr(unittest.TestCase, 'assertIn'):
+        def assertIn(self, first, second, msg=None):
+            self.assertTrue(first in second, msg=msg)
+
+    # Implement assertNotIn for Python runtimes < 2.7 or < 3.1
+    if not hasattr(unittest.TestCase, 'assertNotIn'):
+        def assertNotIn(self, first, second, msg=None):
+            self.assertTrue(first not in second, msg=msg)
+
+    # Implement assertIsInstance for Python runtimes < 2.7 or < 3.1
+    if not hasattr(unittest.TestCase, 'assertIsInstance'):
+        def assertIsInstance(self, obj, cls, msg=None):
+            self.assertTrue(isinstance(obj, cls), msg=msg)
+
     @classmethod
     def tearDownClass(cls):
 
         # Pop the connection to Redis
         testconn = pop_connection()
         assert testconn == cls.testconn, 'Wow, something really nasty ' \
                 'happened to the Redis connection stack. Check your setup.'
+
+# for python < 2.7, which doesn't have setUpClass
+if not hasattr(unittest.TestCase, 'setUpClass'):
+    RQTestCase.setUpClass()