Expose reruns and reruns_delay through pytest.ini file (#194)

* Expose `reruns` and `reruns_delay` through `pytest.ini` file

Co-authored-by: Michael Howitz <[email protected]>

Author: laky55555

CHANGES.rst

@@ -4,7 +4,10 @@ Changelog
 11.1 (unreleased)
 -----------------
 
-- Nothing changed yet.
+Features
+++++++++
+
+- Expose `reruns` and `reruns_delay` through `pytest.ini` file.
 
 
 11.0 (2023-01-12)

pytest_rerunfailures.py

@@ -40,6 +40,7 @@
 
 
 PYTEST_GTE_54 = parse_version(pytest.__version__) >= parse_version("5.4")
+PYTEST_GTE_62 = parse_version(pytest.__version__) >= parse_version("6.2.0")
 PYTEST_GTE_63 = parse_version(pytest.__version__) >= parse_version("6.3.0.dev")
 
 
@@ -60,6 +61,10 @@ def works_with_current_xdist():
         return parse_version(d.version) >= parse_version("1.20")
 
 
+RERUNS_DESC = "number of times to re-run failed tests. defaults to 0."
+RERUNS_DELAY_DESC = "add time (seconds) delay between reruns."
+
+
 # command line options
 def pytest_addoption(parser):
     group = parser.getgroup(
@@ -80,15 +85,13 @@ def pytest_addoption(parser):
         action="store",
         dest="reruns",
         type=int,
-        default=0,
-        help="number of times to re-run failed tests. defaults to 0.",
+        help=RERUNS_DESC,
     )
     group._addoption(
         "--reruns-delay",
         action="store",
         dest="reruns_delay",
         type=float,
-        default=0,
         help="add time (seconds) delay between reruns.",
     )
     group._addoption(
@@ -101,6 +104,9 @@ def pytest_addoption(parser):
         "regex provided. Pass this flag multiple times to accumulate a list "
         "of regexes to match",
     )
+    arg_type = "string" if PYTEST_GTE_62 else None
+    parser.addini("reruns", RERUNS_DESC, type=arg_type)
+    parser.addini("reruns_delay", RERUNS_DELAY_DESC, type=arg_type)
 
 
 def _get_resultlog(config):
@@ -155,21 +161,23 @@ def _get_marker(item):
 
 def get_reruns_count(item):
     rerun_marker = _get_marker(item)
-    reruns = None
-
     # use the marker as a priority over the global setting.
     if rerun_marker is not None:
         if "reruns" in rerun_marker.kwargs:
             # check for keyword arguments
-            reruns = rerun_marker.kwargs["reruns"]
+            return rerun_marker.kwargs["reruns"]
         elif len(rerun_marker.args) > 0:
             # check for arguments
-            reruns = rerun_marker.args[0]
+            return rerun_marker.args[0]
         else:
-            reruns = 1
-    elif item.session.config.option.reruns:
-        # default to the global setting
-        reruns = item.session.config.option.reruns
+            return 1
+
+    reruns = item.session.config.getvalue("reruns")
+    if reruns is not None:
+        return reruns
+
+    with suppress(TypeError, ValueError):
+        reruns = int(item.session.config.getini("reruns"))
 
     return reruns
 
@@ -186,7 +194,12 @@ def get_reruns_delay(item):
         else:
             delay = 0
     else:
-        delay = item.session.config.option.reruns_delay
+        delay = item.session.config.getvalue("reruns_delay")
+        if delay is None:
+            try:
+                delay = float(item.session.config.getini("reruns_delay"))
+            except (TypeError, ValueError):
+                delay = 0
 
     if delay < 0:
         delay = 0

test_pytest_rerunfailures.py

@@ -657,3 +657,47 @@ def test_fail_two():
     )
     result = testdir.runpytest()
     assert_outcomes(result, passed=0, failed=1, rerun=2)
+
+
+def test_ini_file_parameters(testdir):
+    testdir.makepyfile(
+        """
+        import time
+        def test_foo():
+            assert False
+    """
+    )
+    testdir.makeini(
+        """
+        [pytest]
+        reruns = 2
+        reruns_delay = 3
+    """
+    )
+    time.sleep = mock.MagicMock()
+    result = testdir.runpytest()
+
+    time.sleep.assert_called_with(3)
+    assert_outcomes(result, passed=0, failed=1, rerun=2)
+
+
+def test_ini_file_parameters_override(testdir):
+    testdir.makepyfile(
+        """
+        import time
+        def test_foo():
+            assert False
+    """
+    )
+    testdir.makeini(
+        """
+        [pytest]
+        reruns = 2
+        reruns_delay = 3
+    """
+    )
+    time.sleep = mock.MagicMock()
+    result = testdir.runpytest("--reruns", "4", "--reruns-delay", "5")
+
+    time.sleep.assert_called_with(5)
+    assert_outcomes(result, passed=0, failed=1, rerun=4)