Fixed KeyboardInterrupt hanging the asyncio test runner #779
Conversation
src/anyio/_backends/_asyncio.py
Outdated
| 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.
Do you want to extract and pass on the cancel message?
There was a problem hiding this comment.
Hm, might be a good idea.
| @@ -2082,13 +2082,23 @@ async def _run_tests_and_fixtures( | |||
| tuple[Awaitable[T_Retval], asyncio.Future[T_Retval]] | |||
| ], | |||
| ) -> None: | |||
| from _pytest.outcomes import OutcomeException | |||
There was a problem hiding this comment.
This might cause problems in environments where pytest is not installed? My habit is to do something like
OutcomeException = getattr(sys.modules.get("_pytest.outcomes"), "OutcomeException", ())which 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.
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.
Ah, right, I just wasn't looking at a wide enough context 🤦
| @@ -2082,13 +2082,23 @@ async def _run_tests_and_fixtures( | |||
| tuple[Awaitable[T_Retval], asyncio.Future[T_Retval]] | |||
| ], | |||
| ) -> None: | |||
| from _pytest.outcomes import OutcomeException | |||
There was a problem hiding this comment.
Ah, right, I just wasn't looking at a wide enough context 🤦
|
Thanks for the review! |
Changes
This fixes ctrl+c causing the anyio pytest plugin to hang if the test is currently awaiting something. This was caused by the test runner dropping exceptions on the floor.
Checklist
If this is a user-facing code change, like a bugfix or a new feature, please ensure that
you've fulfilled the following conditions (where applicable):
tests/) added which would fail without your patchdocs/, in case of behavior changes or newfeatures)
docs/versionhistory.rst).If this is a trivial change, like a typo fix or a code reformatting, then you can ignore
these instructions.
Updating the changelog
If there are no entries after the last release, use
**UNRELEASED**as the version.If, say, your patch fixes issue #123, the entry should look like this:
* Fix big bad boo-boo in task groups (#123 <https://github.com/agronholm/anyio/issues/123>_; PR by @yourgithubaccount)If there's no issue linked, just link to your pull request instead by updating the
changelog after you've created the PR.