reverted change to not break the intended behavior and added test case for marking classes

Author: mattias-lundell

pytest_ordering/__init__.py

@@ -85,16 +85,22 @@ def _order_tests(tests):
             remaining_tests.append(test)
 
     from_beginning, from_end = split(ordered_tests)
+    remaining_iter = iter(remaining_tests)
 
-    # run test from beginning
-    for test_order in sorted(from_beginning):
-        for test in from_beginning[test_order]:
-            yield test
+    for i in range(max(from_beginning or [-1]) + 1):
+        if i in from_beginning:
+            for test in from_beginning[i]:
+                yield test
+        else:
+            yield next(remaining_iter)
 
-    # run test from end
-    for test_order in sorted(from_end):
-        for test in from_end[test_order]:
-            yield test
+    # TODO TODO TODO
+    for i in range(min(from_end or [0]), 0):
+        if i in from_end:
+            for test in from_end[i]:
+                yield test
+        else:
+            yield next(remaining_iter)
 
-    for test in remaining_tests:
+    for test in remaining_iter:
         yield test

tests/marked_classes.py

@@ -0,0 +1,29 @@
+import pytest
+
+ordering = 'fdeabc'
+
+
+@pytest.mark.order3
+class TestA:
+    def test_a():
+        pass
+
+    def test_b():
+        pass
+
+    def test_c():
+        pass
+
+
+@pytest.mark.order2
+class TestB:
+    def test_d():
+        pass
+
+    def test_e():
+        pass
+
+
+@pytest.mark.order1
+def test_f():
+    pass

tests/test_ordering.py

@@ -3,11 +3,11 @@
 import pytest
 
 import pytest_ordering
-from . import numbers, words, words_backwards, grouping
+from . import numbers, words, words_backwards, grouping, marked_classes
 
 
 @pytest.mark.parametrize('module', [
-    numbers, words, words_backwards, grouping,
+    numbers, words, words_backwards, grouping, marked_classes
 ])
 def test_ordered_tests(module, testdir):
     items = testdir.getitems(module)