[7.4.x] fix #10447 - consider marks in reverse mro order to give base classes priority (#11545)

Co-authored-by: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
This commit is contained in:
github-actions[bot]
2023-10-24 15:04:13 +00:00
committed by GitHub
parent 5dc77253d4
commit 44ad1c9811
3 changed files with 41 additions and 2 deletions

View File

@@ -373,7 +373,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 = [
x.__dict__.get("pytestmark", []) for x in reversed(obj.__mro__)
]
mark_list = []
for item in mark_lists:
if isinstance(item, list):