Skip to content
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

instrumentation/asyncio: catch CancelledError exception in tests #2690

Merged
merged 4 commits into from
Jul 10, 2024

Conversation

xrmx
Copy link
Contributor

@xrmx xrmx commented Jul 10, 2024

Description

After a29242f we are re-raising the CancelledError so we need to catch it on the caller side. Skip anext tests on older pythons and while at it use skipIf instead of reimplementing it.

Fixes #2688

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • tox -e py310-test-instrumentation-asyncio

Does This PR Require a Core Repo Change?

  • Yes. - Link to PR:
  • No.

Checklist:

See contributing.md for styleguide, changelog guidelines, and more.

  • Followed the style guidelines of this project
  • Changelogs have been updated
  • Unit tests have been added
  • Documentation has been updated

After a29242f we are re-raising the
CancelledError so we need to catch it on the caller side.

Fix open-telemetry#2688
@xrmx xrmx added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Jul 10, 2024
@ocelotl ocelotl merged commit 60fb936 into open-telemetry:main Jul 10, 2024
379 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Skip Changelog PRs that do not require a CHANGELOG.md entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

opentelemetry-instrumentation-asyncio is failing
3 participants