-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
fix: iter_markers/get_closest_marker returns correct closest MRO marker (#14329) #14630
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
RonnyPfannschmidt
wants to merge
3
commits into
pytest-dev:main
Choose a base branch
from
RonnyPfannschmidt:fix/iter-markers-mro-closest-first
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+122
−2
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Fixed ``get_closest_marker`` returning a base class marker instead of the subclass marker when test classes use inheritance. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ | |
| import os | ||
| from pathlib import Path | ||
| import re | ||
| import sys | ||
| import textwrap | ||
| import types | ||
| from typing import Any | ||
|
|
@@ -79,6 +80,14 @@ | |
| from _pytest.warning_types import PytestReturnNotNoneWarning | ||
|
|
||
|
|
||
| if sys.version_info >= (3, 12): | ||
| from typing import override | ||
| else: | ||
|
|
||
| def override(func): | ||
| return func | ||
|
|
||
|
|
||
| if TYPE_CHECKING: | ||
| from typing_extensions import Self | ||
|
|
||
|
|
@@ -751,6 +760,29 @@ def from_parent(cls, parent, *, name, obj=None, **kw) -> Self: # type: ignore[o | |
| """The public constructor.""" | ||
| return super().from_parent(name=name, parent=parent, **kw) | ||
|
|
||
| @override | ||
| def _iter_own_markers_closest_first(self) -> Iterator[Mark]: | ||
| """own_markers stores MRO markers in base-first order | ||
| (construction order). For closest-first iteration, reverse at the | ||
| MRO class-group level while preserving decorator order within | ||
| each class.""" | ||
| from _pytest.mark.structures import normalize_mark_list | ||
|
|
||
| # Walk MRO in natural order (closest first: Child, Parent, ...) | ||
| # yielding each class's marks in their decorator-stacking order. | ||
| mro_mark_ids: set[int] = set() | ||
| for cls in self.obj.__mro__: | ||
| cls_marks = cls.__dict__.get("pytestmark", []) | ||
| if not isinstance(cls_marks, Sequence): | ||
| cls_marks = [cls_marks] | ||
| for mark in normalize_mark_list(cls_marks): | ||
| mro_mark_ids.add(id(mark)) | ||
| yield mark | ||
| # Yield any dynamically added markers (via add_marker) not from MRO. | ||
| for mark in self.own_markers: | ||
| if id(mark) not in mro_mark_ids: | ||
| yield mark | ||
|
Comment on lines
+781
to
+784
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seems we should add a test specifically for this behavior
Comment on lines
+781
to
+784
|
||
|
|
||
| def newinstance(self): | ||
| return self.obj() | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.