-
Notifications
You must be signed in to change notification settings - Fork 146
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
Fixed KeyboardInterrupt hanging the asyncio test runner #779
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7b6b63f
Fixed KeyboardInterrupt hanging the asyncio test runner
agronholm 16a5d82
Merge branch 'master' into fix-testrunner-keyboardinterrupt
agronholm b079424
Fixed test failures
agronholm 9a93db6
Merge branch 'master' into fix-testrunner-keyboardinterrupt
agronholm 10a9969
Pass on a cancel message if any
agronholm 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 |
---|---|---|
|
@@ -2082,13 +2082,23 @@ async def _run_tests_and_fixtures( | |
tuple[Awaitable[T_Retval], asyncio.Future[T_Retval]] | ||
], | ||
) -> None: | ||
from _pytest.outcomes import OutcomeException | ||
|
||
with receive_stream, self._send_stream: | ||
async for coro, future in receive_stream: | ||
try: | ||
retval = await coro | ||
except CancelledError: | ||
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. Do you want to extract and pass on the cancel message? 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. Hm, might be a good idea. |
||
if not future.cancelled(): | ||
future.cancel() | ||
|
||
raise | ||
except BaseException as exc: | ||
if not future.cancelled(): | ||
future.set_exception(exc) | ||
|
||
if not isinstance(exc, (Exception, OutcomeException)): | ||
raise | ||
else: | ||
if not future.cancelled(): | ||
future.set_result(retval) | ||
|
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.
This might cause problems in environments where
pytest
is not installed? My habit is to do something likewhich doesn't require it to be installed and also avoids paying for the import if it wouldn't otherwise be used.
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.
I'm not understanding. This is an import in the AnyIO pytest runner. Why would someone try to use that without pytest in the first place?
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.
Ah, right, I just wasn't looking at a wide enough context 🤦