diff --git a/setup.py b/setup.py index eb5d835984..a1152d5f16 100644 --- a/setup.py +++ b/setup.py @@ -99,7 +99,7 @@ def _parse_requirements_file(file_path): "black==22.12.0", "flake8>=3.8.3", "isort>=5.7.0", - "flaky~=3.7.0", + "pytest-rerunfailures>=13.0", "ndjson>=0.3.1", "wheel>=0.36.2", "pytest>=6.0.0", diff --git a/tests/deepsparse/pipelines/test_pipeline.py b/tests/deepsparse/pipelines/test_pipeline.py index 6ad1c71fe4..3406d13815 100644 --- a/tests/deepsparse/pipelines/test_pipeline.py +++ b/tests/deepsparse/pipelines/test_pipeline.py @@ -16,7 +16,6 @@ from concurrent.futures import ThreadPoolExecutor from unittest import mock -import flaky import pytest from deepsparse.legacy.base_pipeline import BasePipeline @@ -125,7 +124,7 @@ def test_pipeline_executor_num_workers(): assert executor._max_workers >= 1 -@flaky.flaky(max_runs=2, min_passes=1) +@pytest.mark.flaky(reruns=2, min_passes=1) @mock_engine(rng_seed=0) def test_pipeline_call_is_async(engine_mock): # attempts to verify that pipeline calls to engine are async diff --git a/tests/server/test_legacy_loggers.py b/tests/server/test_legacy_loggers.py index e52e6fc4d9..ce3a9b9aec 100644 --- a/tests/server/test_legacy_loggers.py +++ b/tests/server/test_legacy_loggers.py @@ -16,6 +16,7 @@ from collections import Counter from unittest import mock +import pytest from deepsparse.legacy.loggers import PythonLogger from deepsparse.legacy.loggers.config import ( PipelineSystemLoggingConfig, @@ -30,7 +31,6 @@ from deepsparse.server.deepsparse_server import DeepsparseServer from deepsparse.server.helpers import server_logger_from_config from fastapi.testclient import TestClient -from flaky import flaky from tests.deepsparse.legacy.loggers.helpers import fetch_leaf_logger from tests.helpers import find_free_port from tests.test_data.server_test_data import SAMPLE_LOGS_DICT @@ -106,7 +106,7 @@ def test_data_logging_from_predefined(): assert log == expected_log -@flaky(max_runs=4, min_passes=3) +@pytest.mark.flaky(reruns=4, min_passes=3) def test_logging_only_system_info(): server_config = ServerConfig( endpoints=[EndpointConfig(task=task, name=name, model=stub)], @@ -195,7 +195,7 @@ def test_multiple_targets_logging(): ) -@flaky(max_runs=3, min_passes=2) +@pytest.mark.flaky(reruns=3, min_passes=2) def test_function_metric_with_target_loggers(): server_config = ServerConfig( endpoints=[