switch only-rerun flag to append action instead of store

Author: gnikonorov

pytest_rerunfailures.py

@@ -33,11 +33,11 @@ def pytest_addoption(parser):
         "re-run failing tests to eliminate flaky failures")
     group._addoption(
         '--only-rerun',
-        action='store',
+        action='append',
         dest='only_rerun',
         type=str,
         default=None,
-        help='Optional comma separated list. If passed, only rerun errors matching the regexes provided.'
+        help='If passed, only rerun errors matching the regex provided. Pass this flag multiple times to accumulate a list of regexes to match'
     )
     group._addoption(
         '--reruns',
@@ -190,7 +190,7 @@ def _should_hard_fail_on_error(session_config, report):
     if not rerun_errors:
         return False
 
-    for rerun_regex in rerun_errors.split(','):
+    for rerun_regex in rerun_errors:
         if re.search(rerun_regex, report.longrepr.reprcrash.message):
             return False
 

test_pytest_rerunfailures.py

@@ -409,27 +409,31 @@ def pytest_runtest_logfinish(nodeid, location):
     result.stdout.fnmatch_lines(hook_message)
 
 @pytest.mark.parametrize(
-        "file_text, only_rerun_text, should_rerun",
+        "file_text, only_rerun_texts, should_rerun",
         [
-            ('def test_only_rerun(): raise AssertionError("ERR")', 'AssertionError', True),
-            ('def test_only_rerun(): raise AssertionError("ERR")', 'Assertion*', True),
-            ('def test_only_rerun(): raise AssertionError("ERR")', 'Assertion', True),
-            ('def test_only_rerun(): raise AssertionError("ERR")', 'ValueError', False),
-            ('def test_only_rerun(): raise AssertionError("ERR")', 'AssertionError,ValueError', True),
-            ('def test_only_rerun(): raise AssertionError("ERR")', 'AssertionError ValueError', False),
-            ('def test_only_rerun(): raise AssertionError("ERR")', '', True),
-            ('def test_only_rerun(): raise AssertionError("ERR")', 'AssertionError: ', True),
-            ('def test_only_rerun(): raise AssertionError("ERR")', 'AssertionError: ERR', True),
-            ('def test_only_rerun(): raise AssertionError("ERR")', 'ERR', True),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['AssertionError'], True),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['Assertion*'], True),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['Assertion'], True),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['ValueError'], False),
+            ('def test_only_rerun(): raise AssertionError("ERR")', [''], True),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['AssertionError: '], True),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['AssertionError: ERR'], True),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['ERR'], True),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['AssertionError,ValueError'], False),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['AssertionError ValueError'], False),
+            ('def test_only_rerun(): raise AssertionError("ERR")', ['AssertionError','ValueError'], True),
         ]
 )
-def test_only_rerun_flag(testdir, file_text, only_rerun_text, should_rerun):
+def test_only_rerun_flag(testdir, file_text, only_rerun_texts, should_rerun):
     testdir.makepyfile(file_text)
 
     num_failed = 1
     num_passed = 0
     num_reruns = 1
     num_reruns_actual = num_reruns if should_rerun else 0
 
-    result = testdir.runpytest('--reruns', str(num_reruns), '--only-rerun', only_rerun_text)
+    pytest_args = ['--reruns', str(num_reruns)]
+    for only_rerun_text in only_rerun_texts:
+        pytest_args.extend(['--only-rerun', only_rerun_text])
+    result = testdir.runpytest(*pytest_args)
     assert_outcomes(result, passed=num_passed, failed=num_failed, rerun=num_reruns_actual)