Tweaks

Author: bluetech

changelog/14329.bugfix.rst

@@ -1 +1,2 @@
-Now the markers are considered in the order from near to far, through the mro. `get_closes_marker("usefixtures")` will also return the nearest mark, but the processing of the `usefixtures` goes from the far mark to the near one.
+Fixed :func:`request.node.get_closest_marker() <_pytest.nodes.Node.get_closest_marker>` (and :func:`iter_markers() <_pytest.nodes.Node.iter_markers>`) traversing MRO in the wrong order (farthest to closest).
+This could also affect :func:`pytest.mark.usefixtures` usage.

src/_pytest/fixtures.py

@@ -1682,6 +1682,9 @@ def _getautousenames(self, node: nodes.Node) -> Iterator[str]:
 
     def _getusefixturesnames(self, node: nodes.Item) -> Iterator[str]:
         """Return the names of usefixtures fixtures applicable to node."""
+        # Reverse order (fartest to closest) is more natural for usefixtures,
+        # e.g. want a module-level usefixture to be requested before a class one,
+        # a parent class' before a child's, etc.
         for marker_node, mark in reversed(
             list(node.iter_markers_with_node(name="usefixtures"))
         ):

src/_pytest/nodes.py

@@ -330,6 +330,8 @@ def add_marker(self, marker: str | MarkDecorator, append: bool = True) -> None:
     def iter_markers(self, name: str | None = None) -> Iterator[Mark]:
         """Iterate over all markers of the node.
 
+        The markers are returned from closest to farthest.
+
         :param name: If given, filter the results by the name attribute.
         :returns: An iterator of the markers of the node.
         """
@@ -340,6 +342,8 @@ def iter_markers_with_node(
     ) -> Iterator[tuple[Node, Mark]]:
         """Iterate over all markers of the node.
 
+        The markers are returned from closest to farthest.
+
         :param name: If given, filter the results by the name attribute.
         :returns: An iterator of (node, mark) tuples.
         """

testing/test_mark.py

@@ -651,41 +651,38 @@ def test_has_inherited(self):
         assert has_inherited_marker.kwargs == {"location": "class"}
         assert has_own.get_closest_marker("missing") is None
 
-    def test_mark_closest_with_parent(self, pytester: Pytester):
-        test_path = pytester.makepyfile(
+    def test_mark_closest_mro(self, pytester: Pytester) -> None:
+        """Marks should be collected from MRO from nearest to furthest (#14329)."""
+        pytester.makepyfile(
             """
             import pytest
 
-            @pytest.mark.data(0)
-            class TestParent:
-                def get_data_mark(self, request: pytest.FixtureRequest):
-                    getted_mark = request.node.get_closest_marker("data")
-                    assert getted_mark
-                    return getted_mark
 
-                def test_case(self, request: pytest.FixtureRequest):
-                    data_mark = self.get_data_mark(request)
-                    assert data_mark.args[0] == 0
+            @pytest.mark.foo(0)
+            class TestParent:
+                def test_only_class(self, request):
+                    assert request.node.get_closest_marker("foo").args[0] == 0
+                    assert [mark.args[0] for mark in request.node.iter_markers("foo")] == [0]
 
-                @pytest.mark.data(1)
-                def test_case_with_own_mark(self, request: pytest.FixtureRequest):
-                    data_mark = self.get_data_mark(request)
-                    assert data_mark.args[0] == 1
+                @pytest.mark.foo(1)
+                def test_function_and_class(self, request):
+                    assert request.node.get_closest_marker("foo").args[0] == 1
+                    assert [mark.args[0] for mark in request.node.iter_markers("foo")] == [1, 0]
 
 
-            @pytest.mark.data(2)
+            @pytest.mark.foo(2)
             class TestChild(TestParent):
-                def test_case(self, request: pytest.FixtureRequest):
-                    data_mark = self.get_data_mark(request)
-                    assert data_mark.args[0] == 2
-
-                @pytest.mark.data(3)
-                def test_case_with_own_mark(self, request: pytest.FixtureRequest):
-                    data_mark = self.get_data_mark(request)
-                    assert data_mark.args[0] == 3
+                def test_only_class(self, request):
+                    assert request.node.get_closest_marker("foo").args[0] == 2
+                    assert [mark.args[0] for mark in request.node.iter_markers("foo")] == [2, 0]
+
+                @pytest.mark.foo(3)
+                def test_function_and_class(self, request):
+                    assert request.node.get_closest_marker("foo").args[0] == 3
+                    assert [mark.args[0] for mark in request.node.iter_markers("foo")] == [3, 2, 0]
             """
         )
-        result = pytester.runpytest(test_path)
+        result = pytester.runpytest()
         result.assert_outcomes(passed=4)
 
     def test_mark_with_wrong_marker(self, pytester: Pytester) -> None: