Skip to content

Use @pytest.mark.flaky decorator instead of @flaky.flaky#4700

Merged
xrmx merged 2 commits intoopen-telemetry:mainfrom
mgorny:flaky-mark
Jul 29, 2025
Merged

Use @pytest.mark.flaky decorator instead of @flaky.flaky#4700
xrmx merged 2 commits intoopen-telemetry:mainfrom
mgorny:flaky-mark

Conversation

@mgorny
Copy link
Contributor

@mgorny mgorny commented Jul 26, 2025

Description

Use the modern @pytest.mark.flaky decorator over @flaky.flaky in tests. This avoids typing issues, and makes the tests compatible with other implementations of that decorator, such as pytest-rerunfailures.

Type of change

Internal test change.

How Has This Been Tested?

tox -e py313-test-opentelemetry-sdk

Does This PR Require a Contrib Repo Change?

  • Yes. - Link to PR:
  • No.

Checklist:

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

Use the modern `@pytest.mark.flaky` decorator over `@flaky.flaky` in tests.
This avoids typing issues, and makes the tests compatible with other
implementations of that decorator, such as `pytest-rerunfailures`.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny mgorny requested a review from a team as a code owner July 26, 2025 10:41
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jul 26, 2025

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: mgorny / name: Michał Górny (1a6b074)
  • ✅ login: xrmx / name: Riccardo Magliocchetti (e6278db)

@xrmx xrmx added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Jul 28, 2025
@xrmx xrmx moved this to Easy to review / merge / close in Python PR digest Jul 28, 2025
@xrmx xrmx enabled auto-merge (squash) July 29, 2025 08:00
@xrmx xrmx merged commit f9ca475 into open-telemetry:main Jul 29, 2025
464 of 467 checks passed
@github-project-automation github-project-automation bot moved this from Easy to review / merge / close to Done in Python PR digest Jul 29, 2025
@mgorny mgorny deleted the flaky-mark branch July 29, 2025 09:08
@mgorny
Copy link
Contributor Author

mgorny commented Jul 29, 2025

Thank you!

JWinermaSplunk pushed a commit to JWinermaSplunk/opentelemetry-python that referenced this pull request Feb 17, 2026
…lemetry#4700)

Use the modern `@pytest.mark.flaky` decorator over `@flaky.flaky` in tests.
This avoids typing issues, and makes the tests compatible with other
implementations of that decorator, such as `pytest-rerunfailures`.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
JWinermaSplunk pushed a commit to JWinermaSplunk/opentelemetry-python that referenced this pull request Feb 17, 2026
…lemetry#4700)

Use the modern `@pytest.mark.flaky` decorator over `@flaky.flaky` in tests.
This avoids typing issues, and makes the tests compatible with other
implementations of that decorator, such as `pytest-rerunfailures`.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
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

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants