-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
display single contained exception in excgroups in test summary #12975
Open
jakkdl
wants to merge
6
commits into
pytest-dev:main
Choose a base branch
from
jakkdl:short_info_excgroup
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.
+103
−0
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
47996bd
display single contained exception in excgroups in short test summary…
jakkdl d797187
Merge branch 'main' into short_info_excgroup
jakkdl aa201f3
Merge remote-tracking branch 'origin/main' into short_info_excgroup
jakkdl f59a8d1
fix test
jakkdl 3311c18
move logic to ExceptionInfo
jakkdl 033120b
add test case for codecov
jakkdl 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
There are no files selected for viewing
This file contains 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 @@ | ||
If a test fails with an exceptiongroup with a single exception, the contained exception will now be displayed in the short test summary info. |
This file contains 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 | ||||
---|---|---|---|---|---|---|
|
@@ -589,6 +589,31 @@ | |||||
representation is returned (so 'AssertionError: ' is removed from | ||||||
the beginning). | ||||||
""" | ||||||
|
||||||
def _get_single_subexc( | ||||||
eg: BaseExceptionGroup[BaseException], | ||||||
) -> BaseException | None: | ||||||
res: BaseException | None = None | ||||||
for subexc in eg.exceptions: | ||||||
if res is not None: | ||||||
return None | ||||||
|
||||||
if isinstance(subexc, BaseExceptionGroup): | ||||||
res = _get_single_subexc(subexc) | ||||||
if res is None: | ||||||
# there were multiple exceptions in the subgroup | ||||||
return None | ||||||
else: | ||||||
res = subexc | ||||||
return res | ||||||
|
||||||
if ( | ||||||
tryshort | ||||||
and isinstance(self.value, BaseExceptionGroup) | ||||||
and (subexc := _get_single_subexc(self.value)) is not None | ||||||
): | ||||||
return f"[in {type(self.value).__name__}] {subexc!r}" | ||||||
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.
Suggested change
as discussed in the issue |
||||||
|
||||||
lines = format_exception_only(self.type, self.value) | ||||||
text = "".join(lines) | ||||||
text = text.rstrip() | ||||||
|
This file contains 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.
Simpler implementation: