-
-
Notifications
You must be signed in to change notification settings - Fork 332
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
Elide task.context.run() and contextvars.callable() frames from tracebacks #631
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 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
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
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 |
---|---|---|
@@ -1,9 +1,11 @@ | ||
import contextvars | ||
import functools | ||
import platform | ||
import re | ||
import sys | ||
import threading | ||
import time | ||
import traceback | ||
import warnings | ||
from contextlib import contextmanager | ||
from math import inf | ||
|
@@ -1897,6 +1899,27 @@ def handle(exc): | |
assert result == [[0, 0], [1, 1]] | ||
|
||
|
||
async def test_run_impl_traceback_frame_removal(): | ||
async def my_child_task(): | ||
raise KeyError() | ||
|
||
try: | ||
# Trick: For now cancel/nursery scopes still leave a bunch of tb gunk | ||
# behind. But if there's a MultiError, they leave it on the MultiError, | ||
# which lets us get a clean look at the KeyError itself. Someday I | ||
# guess this will always be a MultiError (#611), but for now we can | ||
# force it by raising two exceptions. | ||
async with _core.open_nursery() as nursery: | ||
nursery.start_soon(my_child_task) | ||
nursery.start_soon(my_child_task) | ||
except _core.MultiError as exc: | ||
first_exc = exc.exceptions[0] | ||
assert isinstance(first_exc, KeyError) | ||
tb_text = ''.join(traceback.format_tb(first_exc.__traceback__)) | ||
for r in ('/trio/_core/.* in run_impl$', '/contextvars/.* in run$'): | ||
assert not re.search(r, tb_text, re.MULTILINE) | ||
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. If you're doing it this way, then I think you can simplify to just try:
async with trio.open_nursery() as nursery:
nursery.start_soon(my_child_task)
except KeyError as exc:
... (Of course that will then need adjusting when we're working on #611, but everything will, so I wouldn't worry about that.) |
||
|
||
|
||
def test_contextvar_support(): | ||
var = contextvars.ContextVar("test") | ||
var.set("before") | ||
|
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.
pragma: no cover
is for cases where we don't even want to have test coverage. Here, not only is it useful to have tests that cover both branches of theif
, we actually have those tests :-). (We test on multiple python versions and combine the coverage.) So we shouldn't usepragma: no cover
here.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.
Oh that's good-- I assumed the coverage testing was looking at each version run individually rather than the aggregate.