Skip to content
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

Jump to bottom

Retire flaky in favour of pytest-rerunfailures #1628

Merged
merged 2 commits into from
Mar 5, 2024
Merged

Retire flaky in favour of pytest-rerunfailures #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
637b6e5
initial commit
dbogunowicz Mar 5, 2024
a1defa0
allow for new pytest version
dbogunowicz Mar 5, 2024
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 setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ 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,<8.1.0",
"pytest>=6.0.0",
"onnxruntime>=1.7.0",
"flask>=1.0.0",
"flask-cors>=3.0.0",
Expand Down
3 changes: 1 addition & 2 deletions tests/deepsparse/pipelines/test_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from concurrent.futures import ThreadPoolExecutor
from unittest import mock

import flaky
import pytest
from deepsparse.legacy.base_pipeline import BasePipeline

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/server/test_legacy_loggers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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)],
Expand Down Expand Up @@ -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=[
Expand Down
Loading