added rerun_except option (#180)

* added option --rerun-except
* updated README with rerun_except option
* added test for rerun_except

Co-authored-by: Dheepan R <dheepan@dheepanMac.local>

Author: dheepan2

CHANGES.rst

@@ -10,6 +10,11 @@ Bug fixes
 - Fix crash when pytest-xdist is installed but disabled.
   (Thanks to `@mgorny <https://github.com/mgorny>`_ for the PR.)
 
+Features
+++++++++
+
+- Added option `--rerun-except` to rerun failed tests those are other than the mentioned Error.
+
 
 10.2 (2021-09-17)
 -----------------

README.rst

@@ -89,6 +89,24 @@ would only rerun those errors that match ``AssertionError`` or ``ValueError``:
 
    $ pytest --reruns 5 --only-rerun AssertionError --only-rerun ValueError
 
+Re-run all failures other than matching certain expressions
+-----------------------------------------------------------
+
+To re-run only those failures that do not match a certain list of expressions, use the
+``--rerun-except`` flag and pass it a regular expression. For example,
+the following would only rerun errors other than that match ``AssertionError``:
+
+.. code-block:: bash
+
+   $ pytest --reruns 5 --rerun-except AssertionError
+
+Passing the flag multiple times accumulates the arguments, so the following
+would only rerun those errors that does not match with ``AssertionError`` or ``OSError``:
+
+.. code-block:: bash
+
+   $ pytest --reruns 5 --rerun-except AssertionError --rerun-except OSError
+
 Re-run individual failures
 --------------------------
 

pytest_rerunfailures.py

@@ -87,6 +87,16 @@ def pytest_addoption(parser):
         default=0,
         help="add time (seconds) delay between reruns.",
     )
+    group._addoption(
+        "--rerun-except",
+        action="append",
+        dest="rerun_except",
+        type=str,
+        default=None,
+        help="If passed, only rerun errors other than matching the "
+        "regex provided. Pass this flag multiple times to accumulate a list "
+        "of regexes to match",
+    )
 
 
 def _get_resultlog(config):
@@ -280,12 +290,23 @@ def _should_hard_fail_on_error(session_config, report):
         return False
 
     rerun_errors = session_config.option.only_rerun
-    if not rerun_errors:
+    rerun_except_errors = session_config.option.rerun_except
+
+    if not rerun_errors and not rerun_except_errors:
+
         return False
 
-    for rerun_regex in rerun_errors:
-        if re.search(rerun_regex, report.longrepr.reprcrash.message):
-            return False
+    if rerun_errors:
+        for rerun_regex in rerun_errors:
+            if re.search(rerun_regex, report.longrepr.reprcrash.message):
+
+                return False
+
+    if rerun_except_errors:
+        for rerun_regex in rerun_except_errors:
+            if not re.search(rerun_regex, report.longrepr.reprcrash.message):
+
+                return False
 
     return True
 

test_pytest_rerunfailures.py

@@ -552,6 +552,36 @@ def test_only_rerun_flag(testdir, only_rerun_texts, should_rerun):
     )
 
 
+@pytest.mark.parametrize(
+    "rerun_except_texts, should_rerun",
+    [
+        (["AssertionError"], True),
+        (["Assertion*"], True),
+        (["Assertion"], True),
+        (["ValueError"], False),
+        (["AssertionError: "], True),
+        (["ERR"], False),
+        (["AssertionError", "OSError"], True),
+    ],
+)
+def test_rerun_except_flag(testdir, rerun_except_texts, should_rerun):
+    testdir.makepyfile('def test_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 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(
     "condition, expected_reruns",
     [