Skip to content

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

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.

Sign up for GitHub

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

Merged
xrmx merged 2 commits into from
Jul 29, 2025
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a6b074
Use `@pytest.mark.flaky` decorator instead of `@flaky.flaky`
mgorny Jul 26, 2025
e6278db
Merge branch 'main' into flaky-mark
xrmx Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions opentelemetry-sdk/tests/metrics/test_periodic_exporting_metric_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from typing import Optional, Sequence
from unittest.mock import Mock

from flaky import flaky
import pytest

from opentelemetry.sdk.metrics import Counter, MetricsTimeoutError
from opentelemetry.sdk.metrics._internal import _Counter
Expand Down Expand Up @@ -194,7 +194,7 @@ def test_ticker_value_exception_on_negative(self):
export_interval_millis=-100,
)

@flaky(max_runs=3, min_passes=1)
@pytest.mark.flaky(max_runs=3, min_passes=1)
def test_ticker_collects_metrics(self):
exporter = FakeMetricsExporter()

Expand Down