Merge pull request #16 from eLRuLL/py26

adding python2.6 support

Author: jbasko

.travis.yml

@@ -3,6 +3,7 @@
 sudo: false
 language: python
 python:
+  - "2.6"
   - "2.7"
   - "3.5"
 

README.rst

@@ -1,7 +1,7 @@
 pytest-random-order
 ===================================
 
-.. image:: https://img.shields.io/badge/python-2.7%2C%203.5-blue.svg
+.. image:: https://img.shields.io/badge/python-2.6%2C%202.7%2C%203.5-blue.svg
     :target: https://github.com/jbasko/pytest-random-order
 
 .. image:: https://img.shields.io/badge/coverage-98%25-green.svg

pytest_random_order/plugin.py

@@ -39,10 +39,10 @@ def pytest_report_header(config):
 
     if config.getoption('random_order_bucket'):
         bucket = config.getoption('random_order_bucket')
-        out += "Using --random-order-bucket={}\n".format(bucket)
+        out += "Using --random-order-bucket={0}\n".format(bucket)
 
     if hasattr(config, 'random_order_seed'):
-        out += 'Using --random-order-seed={}\n'.format(getattr(config, 'random_order_seed'))
+        out += 'Using --random-order-seed={0}\n'.format(getattr(config, 'random_order_seed'))
 
     return out
 
@@ -60,7 +60,7 @@ def pytest_collection_modifyitems(session, config, items):
     except Exception as e:
         # See the finally block -- we only fail if we have lost user's tests.
         _, _, exc_tb = sys.exc_info()
-        failure = 'pytest-random-order plugin has failed with {!r}:\n{}'.format(
+        failure = 'pytest-random-order plugin has failed with {0!r}:\n{1}'.format(
             e, ''.join(traceback.format_tb(exc_tb, 10))
         )
         config.warn(0, failure, None)

pytest_random_order/shuffler.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import collections
+from collections import namedtuple
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 import random
 
 
@@ -15,7 +19,7 @@
 to preserve a distinct disabled sub-bucket within a larger bucket and not mix it up with another
 disabled sub-bucket of the same larger bucket.
 """
-ItemKey = collections.namedtuple('ItemKey', field_names=('bucket', 'disabled', 'x'))
+ItemKey = namedtuple('ItemKey', field_names=('bucket', 'disabled', 'x'))
 ItemKey.__new__.__defaults__ = (None, None)
 
 
@@ -57,7 +61,7 @@ def get_full_bucket_key(item):
     # For a sequence of items A1, A2, B1, B2, C1, C2,
     # where key(A1) == key(A2) == key(C1) == key(C2),
     # items A1, A2, C1, and C2 will end up in the same bucket.
-    buckets = collections.OrderedDict()
+    buckets = OrderedDict()
     for item in items:
         full_bucket_key = get_full_bucket_key(item)
         if full_bucket_key not in buckets:

setup.py

@@ -31,6 +31,7 @@ def read(fname):
         'Topic :: Software Development :: Testing',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',

tests/conftest.py

@@ -37,13 +37,13 @@ def get_test_calls():
 def twenty_tests():
     code = []
     for i in range(20):
-        code.append('def test_a{}(): assert True\n'.format(str(i).zfill(2)))
+        code.append('def test_a{0}(): assert True\n'.format(str(i).zfill(2)))
     return ''.join(code)
 
 
 @pytest.fixture
 def twenty_cls_tests():
     code = []
     for i in range(20):
-        code.append('\tdef test_b{}(self): self.assertTrue\n'.format(str(i).zfill(2)))
+        code.append('\tdef test_b{0}(self): self.assertTrue\n'.format(str(i).zfill(2)))
     return ''.join(code)

tests/test_actual_test_runs.py

@@ -141,7 +141,7 @@ def test_it_works_with_actual_tests(tmp_tree_of_tests, get_test_calls, bucket):
     sequences = set()
 
     for x in range(5):
-        result = tmp_tree_of_tests.runpytest('--random-order-bucket={}'.format(bucket), '--verbose')
+        result = tmp_tree_of_tests.runpytest('--random-order-bucket={0}'.format(bucket), '--verbose')
         result.assert_outcomes(passed=14, failed=3)
         seq = get_test_calls(result)
         check_call_sequence(seq, bucket=bucket)
@@ -159,17 +159,17 @@ def test_random_order_seed_is_respected(testdir, twenty_tests, get_test_calls):
         '3': None,
     }
     for seed in call_sequences.keys():
-        result = testdir.runpytest('--random-order-seed={}'.format(seed))
+        result = testdir.runpytest('--random-order-seed={0}'.format(seed))
 
         result.stdout.fnmatch_lines([
-            '*Using --random-order-seed={}*'.format(seed),
+            '*Using --random-order-seed={0}*'.format(seed),
         ])
 
         result.assert_outcomes(passed=20)
         call_sequences[seed] = get_test_calls(result)
 
     for seed in call_sequences.keys():
-        result = testdir.runpytest('--random-order-seed={}'.format(seed))
+        result = testdir.runpytest('--random-order-seed={0}'.format(seed))
         result.assert_outcomes(passed=20)
         assert call_sequences[seed] == get_test_calls(result)
 
@@ -194,7 +194,7 @@ def test_generated_seed_is_reported_and_run_can_be_reproduced(testdir, twenty_te
             break
     assert seed
 
-    result2 = testdir.runpytest('-v', '--random-order-seed={}'.format(seed))
+    result2 = testdir.runpytest('-v', '--random-order-seed={0}'.format(seed))
     result2.assert_outcomes(passed=20)
     calls2 = get_test_calls(result2)
     assert calls == calls2

tests/test_markers.py

@@ -5,7 +5,7 @@
 def test_marker_disables_random_order_in_module(testdir, twenty_tests, get_test_calls, disabled):
     testdir.makepyfile(
         'import pytest\n' +
-        ('pytestmark = pytest.mark.random_order(disabled={})\n'.format(disabled)) +
+        ('pytestmark = pytest.mark.random_order(disabled={0})\n'.format(disabled)) +
         twenty_tests
     )
 
@@ -26,7 +26,7 @@ def test_marker_disables_random_order_in_class(testdir, twenty_cls_tests, get_te
         'import pytest\n\n' +
         'from unittest import TestCase\n\n' +
         'class MyTest(TestCase):\n' +
-        '\tpytestmark = pytest.mark.random_order(disabled={})\n'.format(disabled) +
+        '\tpytestmark = pytest.mark.random_order(disabled={0})\n'.format(disabled) +
         twenty_cls_tests + '\n'
     )
 

tox.ini

@@ -1,11 +1,16 @@
 # For more information about tox, see https://tox.readthedocs.io/en/latest/
 [tox]
-envlist = py27,py35,flake8
+envlist = py26,py27,py3,flake8
 
 [testenv]
 deps = pytest
 commands = py.test {posargs:tests}
 
+[testenv:py26]
+deps =
+    pytest
+    ordereddict
+
 [testenv:flake8]
 skip_install = true
 deps = flake8