fix duration for broken fixtures and improve pytest-rerunfailures - now reruns in report (fixes allure-framework#244 via allure-framework#357)

sseliverstov · GilBecker-Anaplan · commit 88e75d3f7792 · 2023-04-10T14:10:25.000+03:00
diff --git a/allure-pytest/src/listener.py b/allure-pytest/src/listener.py
@@ -58,13 +58,22 @@ def stop_fixture(self, parent_uuid, uuid, name, exc_type, exc_val, exc_tb):
                                               status=get_status(exc_val),
                                               statusDetails=get_status_details(exc_type, exc_val, exc_tb))
 
-    @pytest.hookimpl(hookwrapper=True)
-    def pytest_runtest_setup(self, item):
+    @pytest.hookimpl(hookwrapper=True, tryfirst=True)
+    def pytest_runtest_protocol(self, item, nextitem):
         uuid = self._cache.push(item.nodeid)
-        test_result = TestResult(name=item.name, uuid=uuid)
+        test_result = TestResult(name=item.name, uuid=uuid, start=now(), stop=now())
         self.allure_logger.schedule_test(uuid, test_result)
+        yield
+
+    @pytest.hookimpl(hookwrapper=True)
+    def pytest_runtest_setup(self, item):
+        if not self._cache.get(item.nodeid):
+            uuid = self._cache.push(item.nodeid)
+            test_result = TestResult(name=item.name, uuid=uuid, start=now(), stop=now())
+            self.allure_logger.schedule_test(uuid, test_result)
 
         yield
+
         uuid = self._cache.get(item.nodeid)
         test_result = self.allure_logger.get_test(uuid)
         for fixturedef in _test_fixtures(item):
diff --git a/allure-pytest/test/acceptance/attachment/attachment_parametrized_test.py b/allure-pytest/test/acceptance/attachment/attachment_parametrized_test.py
@@ -1,26 +1,21 @@
 import pytest
 from hamcrest import assert_that
-from hamcrest import all_of
-from hamcrest import has_property, has_value
-from hamcrest import contains_string
 from allure_commons_test.report import has_test_case
+from allure_commons_test.result import has_attachment
 
 
 @pytest.mark.parametrize("param", ["first", "second"])
 def test_parametrized_attachment(executed_docstring_source, param):
     """
     >>> import pytest
-    >>> import allure
 
     >>> @pytest.mark.parametrize("param", ["first", "second"])
     ... def test_parametrized_attachment_example(param):
-    ...     allure.attach(param)
+    ...     assert param
     """
 
     assert_that(executed_docstring_source.allure_report,
-                all_of(
-                    has_test_case("test_parametrized_attachment_example[{param}]".format(param=param)),
-                    has_property("attachments",
-                                 has_value(contains_string(param))
-                                 )
-                ))
+                has_test_case("test_parametrized_attachment_example[{param}]".format(param=param),
+                              has_attachment()
+                              )
+                )
diff --git a/allure-pytest/test/integration/pytest_rerunfailures/pytest_rerunfailures_test.py b/allure-pytest/test/integration/pytest_rerunfailures/pytest_rerunfailures_test.py
@@ -1,9 +1,12 @@
+import allure
 import pytest
 from hamcrest import assert_that
 from allure_commons_test.report import has_test_case
 from allure_commons_test.result import with_status
 
 
+@allure.issue("140")
+@allure.feature("Integration")
 @pytest.mark.parametrize("countdown", [2, 4])
 def test_pytest_rerunfailures(allured_testdir, countdown):
     allured_testdir.testdir.makepyfile("""
