Fix handling of --rerun-except arguments (#226)

Previously, a failure had to match all --rerun-except arguments
to prevent a test from rerunning.  Now it will not rerun if one or
more are matched.

Additionally, if --only-rerun and --rerun-except are used together,
a failure must match at least one --only-rerun pattern and none of
the --rerun-except patterns for the test to be rerun.  Previously
a test would be rerun if it matched neither --only-rerun nor
--rerun-except.

Fixes #225

---------

Co-authored-by: Michael Howitz <mh@gocept.com>

Author: cfulljames

CHANGES.rst

@@ -16,6 +16,17 @@ Features
 
 - Add support for pytest 7.3, 7.4.
 
+Bug fixes
++++++++++
+
+-- Failures are now rerun only if they match at least one ``--only-rerun``
+   pattern (if given) and none of the ``--rerun-except`` patterns. Previously,
+   using both ``--only-rerun`` and ``--rerun-except`` together could cause
+   failures to be rerun even if they did not match any ``--only-rerun``
+   pattern, and when using multiple ``--rerun-except`` patterns, all failures
+   would be rerun unless they matched every pattern.
+   (`#225 <https://github.com/pytest-dev/pytest-rerunfailures/issues/225>`_)
+
 
 11.1.2 (2023-03-09)
 -------------------

pytest_rerunfailures.py

@@ -315,33 +315,50 @@ def _get_rerun_filter_regex(item, regex_name):
     return regex
 
 
+def _matches_any_rerun_error(rerun_errors, report):
+    for rerun_regex in rerun_errors:
+        try:
+            if re.search(rerun_regex, report.longrepr.reprcrash.message):
+                return True
+        except AttributeError:
+            if re.search(rerun_regex, report.longreprtext):
+                return True
+    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
 
     rerun_errors = _get_rerun_filter_regex(item, "only_rerun")
     rerun_except_errors = _get_rerun_filter_regex(item, "rerun_except")
 
-    if not rerun_errors and not rerun_except_errors:
-
+    if (not rerun_errors) and (not rerun_except_errors):
+        # Using neither --only-rerun nor --rerun-except
         return False
 
-    if rerun_errors:
-        for rerun_regex in rerun_errors:
-            try:
-                if re.search(rerun_regex, report.longrepr.reprcrash.message):
-                    return False
-            except AttributeError:
-                if re.search(rerun_regex, report.longreprtext):
-                    return False
-
-    if rerun_except_errors:
-        for rerun_regex in rerun_except_errors:
-            if not re.search(rerun_regex, report.longrepr.reprcrash.message):
+    elif rerun_errors and (not rerun_except_errors):
+        # Using --only-rerun but not --rerun-except
+        return not _matches_any_rerun_error(rerun_errors, report)
 
-                return False
+    elif (not rerun_errors) and rerun_except_errors:
+        # Using --rerun-except but not --only-rerun
+        return _matches_any_rerun_except_error(rerun_except_errors, report)
 
-    return True
+    else:
+        # Using both --only-rerun and --rerun-except
+        matches_rerun_only = _matches_any_rerun_error(rerun_errors, report)
+        matches_rerun_except = _matches_any_rerun_except_error(
+            rerun_except_errors, report
+        )
+        return (not matches_rerun_only) or matches_rerun_except
 
 
 def _should_not_rerun(item, report, reruns):

test_pytest_rerunfailures.py

@@ -575,6 +575,7 @@ def test_xfail():
         (["AssertionError: "], True),
         (["ERR"], False),
         (["AssertionError", "OSError"], True),
+        (["ValueError", "OSError"], False),
     ],
 )
 def test_rerun_except_flag(testdir, rerun_except_texts, should_rerun):
@@ -587,7 +588,44 @@ def test_rerun_except_flag(testdir, rerun_except_texts, should_rerun):
 
     pytest_args = ["--reruns", str(num_reruns)]
     for rerun_except_text in rerun_except_texts:
-        print(rerun_except_text)
+        pytest_args.extend(["--rerun-except", rerun_except_text])
+    result = testdir.runpytest(*pytest_args)
+    assert_outcomes(
+        result, passed=num_passed, failed=num_failed, rerun=num_reruns_actual
+    )
+
+
+@pytest.mark.parametrize(
+    "only_rerun_texts, rerun_except_texts, should_rerun",
+    [
+        # Matches --only-rerun, but not --rerun-except (rerun)
+        (["ValueError"], ["Not a Match"], True),
+        (["ValueError", "AssertionError"], ["Not a match", "OSError"], True),
+        # Matches --only-rerun AND --rerun-except (no rerun)
+        (["ValueError"], ["ERR"], False),
+        (["OSError", "ValueError"], ["Not a match", "ERR"], False),
+        # Matches --rerun-except, but not --only-rerun (no rerun)
+        (["OSError", "AssertionError"], ["TypeError", "ValueError"], False),
+        # Matches neither --only-rerun nor --rerun-except (no rerun)
+        (["AssertionError"], ["OSError"], False),
+        # --rerun-except overrides --only-rerun for same arg (no rerun)
+        (["ValueError"], ["ValueError"], False),
+    ],
+)
+def test_rerun_except_and_only_rerun(
+    testdir, rerun_except_texts, only_rerun_texts, should_rerun
+):
+    testdir.makepyfile('def test_only_rerun_except(): raise ValueError("ERR")')
+
+    num_failed = 1
+    num_passed = 0
+    num_reruns = 1
+    num_reruns_actual = num_reruns if should_rerun else 0
+
+    pytest_args = ["--reruns", str(num_reruns)]
+    for only_rerun_text in only_rerun_texts:
+        pytest_args.extend(["--only-rerun", only_rerun_text])
+    for rerun_except_text in rerun_except_texts:
         pytest_args.extend(["--rerun-except", rerun_except_text])
     result = testdir.runpytest(*pytest_args)
     assert_outcomes(
@@ -704,6 +742,7 @@ def test_fail():
         ("ValueError", None, True),
         (["ValueError"], None, True),
         (["OSError", "ValueError"], None, True),
+        (["OSError", "AssertionError"], None, False),
         # CLI override behavior
         ("AssertionError", "ValueError", False),
         ("ValueError", "AssertionError", True),