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

Author: sseliverstov

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):

allure-pytest/test/acceptance/attachment/attachment_parametrized_test.py

@@ -0,0 +1,21 @@
+import pytest
+from hamcrest import assert_that
+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
+
+    >>> @pytest.mark.parametrize("param", ["first", "second"])
+    ... def test_parametrized_attachment_example(param):
+    ...     assert param
+    """
+
+    assert_that(executed_docstring_source.allure_report,
+                has_test_case("test_parametrized_attachment_example[{param}]".format(param=param),
+                              has_attachment()
+                              )
+                )

allure-pytest/test/acceptance/duration/__init__.py

@@ -0,0 +1,89 @@
+import allure
+import pytest
+from hamcrest import assert_that, has_entry, greater_than, all_of
+from allure_commons_test.report import has_test_case
+from allure_commons.utils import now
+
+
+snippets = [
+    "pass",
+    "assert False",
+    "raise(RuntimeError())",
+    "pytest.skip()",
+    "pytest.fail()",
+    "pytest.xfail()",
+    pytest.param("pytest.exit('msg')", marks=pytest.mark.skip)
+]
+
+
+@pytest.mark.parametrize("snipped", snippets)
+def test_duration(allured_testdir, snipped):
+    allured_testdir.testdir.makepyfile("""
+        def test_duration_example():
+            {snipped}
+    """.format(snipped=snipped))
+
+    timestamp = now()
+    allured_testdir.run_with_allure()
+
+    assert_that(allured_testdir.allure_report,
+                has_test_case("test_duration_example",
+                              all_of(
+                                  has_entry("start", greater_than(timestamp)),
+                                  has_entry("stop", greater_than(timestamp))
+                              ))
+                )
+
+
+@allure.issue("244")
+@pytest.mark.parametrize("snipped", snippets)
+def test_with_fixture_duration(allured_testdir, snipped):
+    allured_testdir.testdir.makepyfile("""
+        import pytest
+
+        @pytest.fixture
+        def fixture():
+            {snipped}
+
+        def test_with_fixture_duration_example(fixture):
+            pass
+    """.format(snipped=snipped))
+
+    timestamp = now()
+    allured_testdir.run_with_allure()
+
+    assert_that(allured_testdir.allure_report,
+                has_test_case("test_with_fixture_duration_example",
+                              all_of(
+                                  has_entry("start", greater_than(timestamp)),
+                                  has_entry("stop", greater_than(timestamp))
+                              ))
+                )
+
+
+@allure.issue("244")
+@pytest.mark.parametrize("snipped", snippets)
+def test_with_fixture_finalizer_duration(allured_testdir, snipped):
+    allured_testdir.testdir.makepyfile("""
+        import pytest
+
+        @pytest.fixture
+        def fixture(request):
+            def finalizer():
+                {snipped}
+            request.addfinalizef(finalizer)
+
+        def test_with_fixture_finalizer_duration(fixture):
+            pass
+    """.format(snipped=snipped))
+
+    timestamp = now()
+    allured_testdir.run_with_allure()
+
+    assert_that(allured_testdir.allure_report,
+                has_test_case("test_with_fixture_finalizer_duration",
+                              all_of(
+                                  has_entry("start", greater_than(timestamp)),
+                                  has_entry("stop", greater_than(timestamp))
+                              ))
+                )

allure-pytest/test/acceptance/duration/duration_time_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("""