Merge pull request #13 from mattias-lundell/develop

Added ability to mark whole classes with order

Author: ftobia

pytest_ordering/__init__.py

@@ -1,7 +1,7 @@
-import re
-
 from ._version import __version__
 
+import re
+from collections import defaultdict
 
 replacements = {
     'first': 0,
@@ -24,8 +24,8 @@
 
 
 def pytest_configure(config):
-    """Register the "run" marker.
-    """
+    """Register the "run" marker."""
+
     config_line = (
         'run: specify ordering information for when tests should run '
         'in relation to one another. Provided by pytest-ordering. '
@@ -41,19 +41,22 @@ def pytest_collection_modifyitems(session, config, items):
 def orderable(marker_name, marker_info):
     if not hasattr(marker_info, 'kwargs'):
         return False
-    if 'order' in marker_info.kwargs:
+    elif 'order' in marker_info.kwargs:
         return True
-    match = re.match('^order(\d+)$', marker_name)
-    return bool(match) or marker_name in replacements
+    else:
+        match = re.match('^order(\d+)$', marker_name)
+        return bool(match) or marker_name in replacements
 
 
 def get_index(marker_name, marker_info):
     match = re.match('^order(\d+)$', marker_name)
+
     if match:
         return int(match.group(1)) - 1
-    if marker_name in replacements:
+    elif marker_name in replacements:
         return replacements[marker_name]
-    return marker_info.kwargs['order']
+    else:
+        return marker_info.kwargs['order']
 
 
 def split(dictionary):
@@ -67,30 +70,37 @@ def split(dictionary):
 
 
 def _order_tests(tests):
-    ordered_tests = {}
+    ordered_tests = defaultdict(list)
     remaining_tests = []
+
     for test in tests:
         # There has got to be an API for this. :-/
         markers = test.keywords.__dict__['_markers']
         orderable_markers = [(k, v) for (k, v) in markers.items()
                              if orderable(k, v)]
         if len(orderable_markers) == 1:
             marker_name, marker_info = orderable_markers[0]
-            ordered_tests[get_index(marker_name, marker_info)] = test
+            ordered_tests[get_index(marker_name, marker_info)].append(test)
         else:
             remaining_tests.append(test)
+
     from_beginning, from_end = split(ordered_tests)
     remaining_iter = iter(remaining_tests)
+
     for i in range(max(from_beginning or [-1]) + 1):
         if i in from_beginning:
-            yield from_beginning[i]
+            for test in from_beginning[i]:
+                yield test
         else:
             yield next(remaining_iter)
+
     # TODO TODO TODO
     for i in range(min(from_end or [0]), 0):
         if i in from_end:
-            yield from_end[i]
+            for test in from_end[i]:
+                yield test
         else:
             yield next(remaining_iter)
+
     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)