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

Fix Issue #239 #240

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Fix Issue #239 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions pytest_rerunfailures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
else:
import importlib_metadata


try:
from xdist.newhooks import pytest_handlecrashitem

Expand All @@ -29,7 +28,6 @@
except ImportError:
HAS_PYTEST_HANDLECRASHITEM = False


PYTEST_GTE_63 = parse_version(pytest.__version__) >= parse_version("6.3.0")


Expand Down Expand Up @@ -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):
Expand All @@ -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
Expand Down
32 changes: 18 additions & 14 deletions test_pytest_rerunfailures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

from pytest_rerunfailures import HAS_PYTEST_HANDLECRASHITEM


pytest_plugins = "pytester"

has_xdist = HAS_PYTEST_HANDLECRASHITEM
Expand Down Expand Up @@ -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 = []
Expand Down
Loading