Add support for more than one relative marker for the same test

Author: mrbean-bremen

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+_Note_:
+Support for Python 2.7 and Python 3.5 will be removed with the release of
+version 1.0.0, which is planned for the near future.
+
+### New features
+- added support for more than one relative marker for the same test
+
 ## [Version 0.10.0](https://pypi.org/project/pytest-order/0.10.0/) (2021-03-18)
 Adds support for class-level relative markers and directory level scope.
 

docs/source/index.rst

@@ -457,6 +457,26 @@ ones. This means that relative ordering always takes preference:
 In this case, ``test_second`` will be executed before ``test_first``,
 regardless of the ordinal markers.
 
+Several relationships for the same marker
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If you need to order a certain test relative to more than one other test, you
+can add more than one test name to the ``before`` or ``after marker
+attributes, separated by spaces:
+
+.. code:: python
+
+ import pytest
+
+ @pytest.mark.order(after="test_second other_module.test_other")
+ def test_first():
+     assert True
+
+ def test_second():
+     assert True
+
+This will ensure that ``test_first`` is executed both after ``test_second``
+and after ``test_other`` which resides in the module ``other_module``.
+
 Configuration
 =============
 There are a few command line options that change the behavior of the

pytest_order/sorter.py

@@ -161,7 +161,7 @@ def handle_order_mark(self, item):
                 warn("Unknown order attribute:'{}'".format(order))
                 order = None
         item.order = order
-        self.handle_relative_mark(item, mark)
+        self.handle_relative_marks(item, mark)
         if order is not None:
             item.nr_rel_items = 0
         return order
@@ -239,18 +239,23 @@ def is_mark_for_class():
                 return items
         return False
 
-    def handle_relative_mark(self, item, mark):
-        before_mark = mark.kwargs.get("before")
-        after_mark = mark.kwargs.get("after")
-        if (before_mark and not self.handle_before_or_after_mark(
-                item, mark, before_mark, is_after=False)):
-            self.warn_about_unknown_test(before_mark)
-            before_mark = None
-        if (after_mark and not self.handle_before_or_after_mark(
-                item, mark, after_mark, is_after=True)):
-            self.warn_about_unknown_test(after_mark)
-            after_mark = None
-        return before_mark or after_mark
+    def handle_relative_marks(self, item, mark):
+        has_relative_marks = False
+        before_marks = mark.kwargs.get("before", "").split()
+        for before_mark in before_marks:
+            if self.handle_before_or_after_mark(
+                    item, mark, before_mark, is_after=False):
+                has_relative_marks = True
+            else:
+                self.warn_about_unknown_test(before_mark)
+        after_marks = mark.kwargs.get("after", "").split()
+        for after_mark in after_marks:
+            if self.handle_before_or_after_mark(
+                    item, mark, after_mark, is_after=True):
+                has_relative_marks = True
+            else:
+                self.warn_about_unknown_test(after_mark)
+        return has_relative_marks
 
     @staticmethod
     def warn_about_unknown_test(rel_mark):

tests/test_relative_ordering.py

@@ -326,6 +326,32 @@ def test_3():
     assert item_names_for(test_content) == ["test_3", "test_2", "test_1"]
 
 
+def test_multiple_markers_in_same_test(item_names_for):
+    test_content = """
+    import pytest
+
+    @pytest.mark.order(after="test_3 test_4 test_5")
+    def test_1():
+        pass
+
+    def test_2():
+        pass
+
+    def test_3():
+        pass
+
+    @pytest.mark.order(before="test_3   test_2")
+    def test_4():
+        pass
+
+    def test_5():
+        pass
+    """
+    assert item_names_for(test_content) == [
+        "test_4", "test_2", "test_3", "test_5", "test_1"
+    ]
+
+
 def test_dependency_after_unknown_test(item_names_for, capsys):
     test_content = """
     import pytest