close pytest test from pytest_runtest_logfinish hook (via #361)

Author: KillAChicken

allure-pytest/setup.py

@@ -26,7 +26,7 @@
 ]
 
 install_requires = [
-    "pytest>=3.3.0",
+    "pytest>=3.4.0",
     "six>=1.9.0",
     "allure-python-commons==2.6.1"
 ]

allure-pytest/src/listener.py

@@ -199,8 +199,11 @@ def pytest_runtest_makereport(self, item, call):
                 self.attach_data(report.capstdout, "stdout", AttachmentType.TEXT, None)
                 self.attach_data(report.capstderr, "stderr", AttachmentType.TEXT, None)
 
-            uuid = self._cache.pop(item.nodeid)
-            self.allure_logger.close_test(uuid)
+    @pytest.hookimpl(hookwrapper=True)
+    def pytest_runtest_logfinish(self, nodeid, location):
+        yield
+        uuid = self._cache.pop(nodeid)
+        self.allure_logger.close_test(uuid)
 
     @allure_commons.hookimpl
     def attach_data(self, body, name, attachment_type, extension):

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

@@ -0,0 +1,49 @@
+from hamcrest import assert_that
+from allure_commons_test.report import has_test_case
+from allure_commons_test.result import has_attachment
+
+
+def test_attach_from_runtest_teardown(allured_testdir):
+    allured_testdir.testdir.makeconftest("""
+        import allure
+
+
+        def pytest_runtest_teardown(*args, **kwargs):
+            allure.attach(body="body", name="attachment from teardown")
+    """)
+
+    allured_testdir.testdir.makepyfile("""
+        def test_attach_from_runtest_teardown():
+            pass
+    """)
+
+    allured_testdir.run_with_allure()
+
+    assert_that(allured_testdir.allure_report,
+                has_test_case("test_attach_from_runtest_teardown",
+                              has_attachment(name="attachment from teardown"),
+                              )
+                )
+
+
+def test_attach_from_runtest_logfinish(allured_testdir):
+    allured_testdir.testdir.makeconftest("""
+        import allure
+
+
+        def pytest_runtest_logfinish(*args, **kwargs):
+            allure.attach(body="body", name="attachment from logfinish")
+    """)
+
+    allured_testdir.testdir.makepyfile("""
+        def test_attach_from_runtest_logfinish():
+            pass
+    """)
+
+    allured_testdir.run_with_allure()
+
+    assert_that(allured_testdir.allure_report,
+                has_test_case("test_attach_from_runtest_logfinish",
+                              has_attachment(name="attachment from logfinish"),
+                              )
+                )