Skip to content

Conversation

@mgorny
Copy link
Contributor

@mgorny mgorny commented Jul 23, 2025

Use the @pytest.mark.flaky fixture in place of the @flaky.flaky decorator, to modernize the code and improve compatibility with other plugins providing the feature such as pytest-rerunfailures.

Fixes #1410

Use the `@pytest.mark.flaky` fixture in place of the `@flaky.flaky`
decorator, to modernize the code and improve compatibility with other
plugins providing the feature such as `pytest-rerunfailures`.

Fixes ipython#1410

Signed-off-by: Michał Górny <[email protected]>
Copy link
Collaborator

@ianthomas23 ianthomas23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @mgorny!

@ianthomas23 ianthomas23 merged commit 4c21800 into ipython:main Jul 24, 2025
38 of 39 checks passed
@mgorny mgorny deleted the flaky-marker branch August 5, 2025 03:06
@mgorny
Copy link
Contributor Author

mgorny commented Aug 5, 2025

Could we also backport it to 6.x, please?

ianthomas23 pushed a commit that referenced this pull request Aug 7, 2025
@ianthomas23
Copy link
Collaborator

Could we also backport it to 6.x, please?

Done in #1421. Sorry I missed it for this week's release.

@mgorny
Copy link
Contributor Author

mgorny commented Aug 7, 2025

No problem at all.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Please consider switching to pytest.mark.flaky marker (and possibly pytest-rerunfailures)

2 participants