Merge pull request #26 from Bengreen/develop

Update to enable non-contiguous ordering

Author: ftobia

.travis.yml

@@ -1,9 +1,7 @@
 language: python
 python: 2.7
 env:
-  #- TOX_ENV=py34
   - TOX_ENV=py33
-  - TOX_ENV=py32
   - TOX_ENV=py27
   - TOX_ENV=py26
 install:

pytest_ordering/__init__.py

@@ -56,23 +56,15 @@ def pytest_collection_modifyitems(session, config, items):
         grouped_items.setdefault(order, []).append(item)
 
     if grouped_items:
-        unordered_items = grouped_items.pop(None, None)
-
         sorted_items = []
-        prev_key = 0
-
-        for key, ordered_items in grouped_items.items():
-
-            if unordered_items and prev_key >= 0 and key < 0:
-
-                sorted_items.extend(unordered_items)
-                unordered_items = None
 
-            prev_key = key
+        unordered_items = [grouped_items.pop(None, [])]
 
-            sorted_items.extend(ordered_items)
+        start_list = sorted((i for i in grouped_items.items() if i[0] >= 0), key=lambda x: x[0])
+        end_list = sorted((i for i in grouped_items.items() if i[0] < 0), key=lambda x: x[0])
 
-        if unordered_items:
-            sorted_items.extend(unordered_items)
+        sorted_items.extend([i[1] for i in start_list])
+        sorted_items.extend(unordered_items)
+        sorted_items.extend([i[1] for i in end_list])
 
-        items[:] = sorted_items
+        items[:] = [item for sublist in sorted_items for item in sublist]

tests/test_ordering.py

@@ -89,6 +89,94 @@ def test_3(): pass
     assert item_names_for(tests_content) == ['test_3', 'test_2', 'test_1']
 
 
+def test_non_contiguous_positive(item_names_for):
+    tests_content = """
+    import pytest
+
+    @pytest.mark.run(order=10)
+    def test_1(): pass
+
+    @pytest.mark.run(order=20)
+    def test_2(): pass
+
+    @pytest.mark.run(order=5)
+    def test_3(): pass
+    """
+
+    assert item_names_for(tests_content) == ['test_3', 'test_1', 'test_2']
+
+
+def test_non_contiguous_negative(item_names_for):
+    tests_content = """
+    import pytest
+
+    @pytest.mark.run(order=-10)
+    def test_1(): pass
+
+    @pytest.mark.run(order=-20)
+    def test_2(): pass
+
+    @pytest.mark.run(order=-5)
+    def test_3(): pass
+    """
+
+    assert item_names_for(tests_content) == ['test_2', 'test_1', 'test_3']
+
+
+def test_non_contiguous_inc_zero(item_names_for):
+    tests_content = """
+    import pytest
+
+    @pytest.mark.run(order=10)
+    def test_1(): pass
+
+    @pytest.mark.run(order=20)
+    def test_2(): pass
+
+    @pytest.mark.run(order=5)
+    def test_3(): pass
+
+    @pytest.mark.run(order=-10)
+    def test_4(): pass
+
+    @pytest.mark.run(order=-20)
+    def test_5(): pass
+
+    @pytest.mark.run(order=-5)
+    def test_6(): pass
+
+    @pytest.mark.run(order=0)
+    def test_7(): pass
+    """
+
+    assert item_names_for(tests_content) == ['test_7', 'test_3', 'test_1', 'test_2', 'test_5', 'test_4', 'test_6']
+
+
+def test_non_contiguous_inc_none(item_names_for):
+    tests_content = """
+    import pytest
+
+    @pytest.mark.run(order=5)
+    def test_1(): pass
+
+    @pytest.mark.run(order=0)
+    def test_2(): pass
+
+    @pytest.mark.run(order=1)
+    def test_3(): pass
+
+    @pytest.mark.run(order=-1)
+    def test_4(): pass
+
+    @pytest.mark.run(order=-5)
+    def test_5(): pass
+
+    def test_6(): pass
+    """
+
+    assert item_names_for(tests_content) == ['test_2', 'test_3', 'test_1', 'test_6', 'test_5', 'test_4']
+
+
 def test_first_mark_class(item_names_for):
     tests_content = """
     import pytest