From d896e7125214ac707d972698b05cfdf3ed1c971a Mon Sep 17 00:00:00 2001 From: metheuspsc Date: Tue, 14 Nov 2023 13:39:44 -0300 Subject: [PATCH] Fix Issue #239 --- pytest_rerunfailures.py | 17 ++++++++--------- test_pytest_rerunfailures.py | 32 ++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/pytest_rerunfailures.py b/pytest_rerunfailures.py index df42b38..656cd91 100644 --- a/pytest_rerunfailures.py +++ b/pytest_rerunfailures.py @@ -20,7 +20,6 @@ else: import importlib_metadata - try: from xdist.newhooks import pytest_handlecrashitem @@ -29,7 +28,6 @@ except ImportError: HAS_PYTEST_HANDLECRASHITEM = False - PYTEST_GTE_63 = parse_version(pytest.__version__) >= parse_version("6.3.0") @@ -266,6 +264,14 @@ def _get_rerun_filter_regex(item, regex_name): def _matches_any_rerun_error(rerun_errors, report): + return _try_match_reprcrash(rerun_errors, report) + + +def _matches_any_rerun_except_error(rerun_except_errors, report): + return _try_match_reprcrash(rerun_except_errors, report) + + +def _try_match_reprcrash(rerun_errors, report): for rerun_regex in rerun_errors: try: if re.search(rerun_regex, report.longrepr.reprcrash.message): @@ -276,13 +282,6 @@ def _matches_any_rerun_error(rerun_errors, report): return False -def _matches_any_rerun_except_error(rerun_except_errors, report): - for rerun_regex in rerun_except_errors: - if re.search(rerun_regex, report.longrepr.reprcrash.message): - return True - return False - - def _should_hard_fail_on_error(item, report): if report.outcome != "failed": return False diff --git a/test_pytest_rerunfailures.py b/test_pytest_rerunfailures.py index 7e203aa..cddbd79 100644 --- a/test_pytest_rerunfailures.py +++ b/test_pytest_rerunfailures.py @@ -6,7 +6,6 @@ from pytest_rerunfailures import HAS_PYTEST_HANDLECRASHITEM - pytest_plugins = "pytester" has_xdist = HAS_PYTEST_HANDLECRASHITEM @@ -717,31 +716,36 @@ def test_fail(): @pytest.mark.parametrize( - "marker_rerun_except,cli_rerun_except,should_rerun", + "marker_rerun_except,cli_rerun_except,raised_error,should_rerun", [ - ("AssertionError", None, False), - ("AssertionError: ERR", None, False), - (["AssertionError"], None, False), - (["AssertionError: ABC"], None, True), - ("ValueError", None, True), - (["ValueError"], None, True), - (["OSError", "ValueError"], None, True), - (["OSError", "AssertionError"], None, False), + ("AssertionError", None, "AssertionError", False), + ("AssertionError: ERR", None, "AssertionError", False), + (["AssertionError"], None, "AssertionError", False), + (["AssertionError: ABC"], None, "AssertionError", True), + ("ValueError", None, "AssertionError", True), + (["ValueError"], None, "AssertionError", True), + (["OSError", "ValueError"], None, "AssertionError", True), + (["OSError", "AssertionError"], None, "AssertionError", False), # CLI override behavior - ("AssertionError", "ValueError", False), - ("ValueError", "AssertionError", True), + ("AssertionError", "ValueError", "AssertionError", False), + ("ValueError", "AssertionError", "AssertionError", True), + ("CustomFailure", None, "CustomFailure", False), + ("CustomFailure", None, "AssertionError", True), ], ) def test_rerun_except_flag_in_flaky_marker( - testdir, marker_rerun_except, cli_rerun_except, should_rerun + testdir, marker_rerun_except, cli_rerun_except, raised_error, should_rerun ): testdir.makepyfile( f""" import pytest + class CustomFailure(Exception): + pass + @pytest.mark.flaky(reruns=1, rerun_except={marker_rerun_except!r}) def test_fail(): - raise AssertionError("ERR") + raise {raised_error}("ERR") """ ) args = []