condition can be evaluated in the real time

use the skipping.evaluate_condition from pytest in order to keep the same behavior with pytest.mark.skipif. It evaluates the condition in real time so that we can decide whether the case should be rerun in runtime

Change-Id: I2575d368c79480223c84498513a4ef605db0c576

Author: likanglin

README.rst

@@ -108,6 +108,20 @@ You can also specify an optional ``condition`` in the re-run marker:
       import random
       assert random.choice([True, False])
 
+You can use ``@pytest.mark.flaky(condition)`` similarly as ``@pytest.mark.skipif(condition)``, see `pytest-mark-skipif <https://docs.pytest.org/en/6.2.x/reference.html#pytest-mark-skipif>`_
+
+.. code-block:: python
+
+    @pytest.mark.flaky(reruns=2,condition="sys.platform.startswith('win32')")
+    def test_example():
+        import random
+        assert random.choice([True, False])
+    # totally same as the above
+    @pytest.mark.flaky(reruns=2,condition=sys.platform.startswith("win32"))
+    def test_example():
+      import random
+      assert random.choice([True, False])
+
 Note that the test will re-run for any ``condition`` that is truthy.
 
 Output

pytest_rerunfailures.py

@@ -4,6 +4,7 @@
 
 import pkg_resources
 import pytest
+from _pytest import skipping
 from _pytest.runner import runtestprotocol
 
 HAS_RESULTLOG = False
@@ -184,7 +185,7 @@ def get_reruns_condition(item):
 
     condition = True
     if rerun_marker is not None and "condition" in rerun_marker.kwargs:
-        condition = rerun_marker.kwargs["condition"]
+        condition = skipping.evaluate_condition(item, rerun_marker, rerun_marker.kwargs["condition"])[0]
 
     return condition
 

test_pytest_rerunfailures.py

@@ -550,3 +550,12 @@ def test_fail_two():
 
     result = testdir.runpytest()
     assert_outcomes(result, passed=0, failed=1, rerun=expected_reruns)
+
+
+retryBool = False
+@pytest.mark.flaky(condition="retryBool", reruns=2)
+def test_str_condition():
+    global retryBool
+    retryBool = True
+    assert False
+