Reverse order on marks from MRO

Fixes pytest-dev#10447
jaraco · Jul 1, 2023 · 43fd1fe · 43fd1fe
1 parent b77d0de
commit 43fd1fe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/changelog/10447.bugfix.rst b/changelog/10447.bugfix.rst
@@ -0,0 +1 @@
+When resolving marks from a class hierarchy MRO, reverse the order so that more basic classes' marks will be processed ahead of ancestral classes.
diff --git a/src/_pytest/mark/structures.py b/src/_pytest/mark/structures.py
@@ -374,7 +374,9 @@ def get_unpacked_marks(
         if not consider_mro:
             mark_lists = [obj.__dict__.get("pytestmark", [])]
         else:
-            mark_lists = [x.__dict__.get("pytestmark", []) for x in obj.__mro__]
+            mark_lists = reversed(
+                [x.__dict__.get("pytestmark", []) for x in obj.__mro__]
+            )
         mark_list = []
         for item in mark_lists:
             if isinstance(item, list):

diff --git a/testing/test_mark.py b/testing/test_mark.py
@@ -1130,6 +1130,6 @@ class C(A, B):
 
     all_marks = get_unpacked_marks(C)
 
-    assert all_marks == [xfail("c").mark, xfail("a").mark, xfail("b").mark]
+    assert all_marks == [xfail("b").mark, xfail("a").mark, xfail("c").mark]
 
     assert get_unpacked_marks(C, consider_mro=False) == [xfail("c").mark]