Skip to content

Commit 1ae58fb

Browse files
authored
Retire flaky in favour of pytest-rerunfailures (#1628)
1 parent 759e794 commit 1ae58fb

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

Diff for: setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ def _parse_requirements_file(file_path):
9999
"black==22.12.0",
100100
"flake8>=3.8.3",
101101
"isort>=5.7.0",
102-
"flaky~=3.7.0",
102+
"pytest-rerunfailures>=13.0",
103103
"ndjson>=0.3.1",
104104
"wheel>=0.36.2",
105-
"pytest>=6.0.0,<8.1.0",
105+
"pytest>=6.0.0",
106106
"onnxruntime>=1.7.0",
107107
"flask>=1.0.0",
108108
"flask-cors>=3.0.0",

Diff for: tests/deepsparse/pipelines/test_pipeline.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from concurrent.futures import ThreadPoolExecutor
1717
from unittest import mock
1818

19-
import flaky
2019
import pytest
2120
from deepsparse.legacy.base_pipeline import BasePipeline
2221

@@ -125,7 +124,7 @@ def test_pipeline_executor_num_workers():
125124
assert executor._max_workers >= 1
126125

127126

128-
@flaky.flaky(max_runs=2, min_passes=1)
127+
@pytest.mark.flaky(reruns=2, min_passes=1)
129128
@mock_engine(rng_seed=0)
130129
def test_pipeline_call_is_async(engine_mock):
131130
# attempts to verify that pipeline calls to engine are async

Diff for: tests/server/test_legacy_loggers.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from collections import Counter
1717
from unittest import mock
1818

19+
import pytest
1920
from deepsparse.legacy.loggers import PythonLogger
2021
from deepsparse.legacy.loggers.config import (
2122
PipelineSystemLoggingConfig,
@@ -30,7 +31,6 @@
3031
from deepsparse.server.deepsparse_server import DeepsparseServer
3132
from deepsparse.server.helpers import server_logger_from_config
3233
from fastapi.testclient import TestClient
33-
from flaky import flaky
3434
from tests.deepsparse.legacy.loggers.helpers import fetch_leaf_logger
3535
from tests.helpers import find_free_port
3636
from tests.test_data.server_test_data import SAMPLE_LOGS_DICT
@@ -106,7 +106,7 @@ def test_data_logging_from_predefined():
106106
assert log == expected_log
107107

108108

109-
@flaky(max_runs=4, min_passes=3)
109+
@pytest.mark.flaky(reruns=4, min_passes=3)
110110
def test_logging_only_system_info():
111111
server_config = ServerConfig(
112112
endpoints=[EndpointConfig(task=task, name=name, model=stub)],
@@ -195,7 +195,7 @@ def test_multiple_targets_logging():
195195
)
196196

197197

198-
@flaky(max_runs=3, min_passes=2)
198+
@pytest.mark.flaky(reruns=3, min_passes=2)
199199
def test_function_metric_with_target_loggers():
200200
server_config = ServerConfig(
201201
endpoints=[

0 commit comments

Comments
 (0)