Merge pull request #17 from sergeychipiga/feature/working-code

working code

Author: ftobia

pytest_ordering/__init__.py

@@ -1,9 +1,8 @@
-from ._version import __version__
+# -*- coding: utf-8 -*-
 
-import re
-from collections import defaultdict
+import pytest
 
-replacements = {
+orders_map = {
     'first': 0,
     'second': 1,
     'third': 2,
@@ -35,72 +34,44 @@ def pytest_configure(config):
 
 
 def pytest_collection_modifyitems(session, config, items):
-    items[:] = list(_order_tests(items))
+    grouped_items = {}
 
+    for item in items:
 
-def orderable(marker_name, marker_info):
-    if not hasattr(marker_info, 'kwargs'):
-        return False
-    elif 'order' in marker_info.kwargs:
-        return True
-    else:
-        match = re.match('^order(\d+)$', marker_name)
-        return bool(match) or marker_name in replacements
+        for mark_name, order in orders_map.items():
+            mark = item.get_marker(mark_name)
 
+            if mark:
+                item.add_marker(pytest.mark.run(order=order))
+                break
 
-def get_index(marker_name, marker_info):
-    match = re.match('^order(\d+)$', marker_name)
+        mark = item.get_marker('run')
 
-    if match:
-        return int(match.group(1)) - 1
-    elif marker_name in replacements:
-        return replacements[marker_name]
-    else:
-        return marker_info.kwargs['order']
+        if mark:
+            order = mark.kwargs.get('order')
+        else:
+            order = None
 
+        grouped_items.setdefault(order, []).append(item)
 
-def split(dictionary):
-    from_beginning, from_end = {}, {}
-    for key, val in dictionary.items():
-        if key >= 0:
-            from_beginning[key] = val
-        else:
-            from_end[key] = val
-    return from_beginning, from_end
-
-
-def _order_tests(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)].append(test)
-        else:
-            remaining_tests.append(test)
+    if grouped_items:
+        unordered_items = grouped_items.pop(None, None)
 
-    from_beginning, from_end = split(ordered_tests)
-    remaining_iter = iter(remaining_tests)
+        sorted_items = []
+        prev_key = 0
 
-    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)
+        for key, ordered_items in grouped_items.items():
 
-    # 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)
+            if unordered_items and prev_key >= 0 and key < 0:
+
+                sorted_items.extend(unordered_items)
+                unordered_items = None
+
+            prev_key = key
+
+            sorted_items.extend(ordered_items)
+
+        if unordered_items:
+            sorted_items.extend(unordered_items)
 
-    for test in remaining_iter:
-        yield test
+        items[:] = sorted_items

pytest_ordering/author.py

@@ -0,0 +1,2 @@
+__author__ = '[email protected] <Frank Tobia>, ' \
+             '[email protected] <Sergei Chipiga>'

pytest_ordering/_version.py renamed to pytest_ordering/version.py

@@ -8,7 +8,7 @@
 # define __version__
 # execfile doesn't exist in python 3
 # see: http://stackoverflow.com/questions/6357361/alternative-to-execfile-in-python-3-2
-exec(open(os.path.join(__here__, 'pytest_ordering', '_version.py')).read())
+exec(open(os.path.join(__here__, 'pytest_ordering', 'version.py')).read())
 
 
 setup(
@@ -26,7 +26,7 @@
     },
     install_requires=['pytest'],
     classifiers=[
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: POSIX',