Fix failed doctest status reporting (allure-framework#709)

delatrie · web-flow · commit 3f113fe586d7 · 2022-11-24T13:01:17.000+05:00
diff --git a/allure-pytest/src/listener.py b/allure-pytest/src/listener.py
@@ -1,4 +1,5 @@
 import pytest
+import doctest
 import allure_commons
 from allure_commons.utils import escape_non_unicode_symbols
 from allure_commons.utils import now
@@ -185,9 +186,9 @@ def pytest_runtest_makereport(self, item, call):
             status_details = StatusDetails(
                 message=message,
                 trace=trace)
-            if (status != Status.SKIPPED
-                    and not (call.excinfo.errisinstance(AssertionError)
-                             or call.excinfo.errisinstance(pytest.fail.Exception))):
+
+            exception = call.excinfo.value
+            if (status != Status.SKIPPED and _exception_brokes_test(exception)):
                 status = Status.BROKEN
 
         if status == Status.PASSED and hasattr(report, 'wasxfail'):
@@ -305,3 +306,11 @@ def _test_fixtures(item):
                 fixturedefs.extend(fixturedefs_pytest)
 
     return fixturedefs
+
+
+def _exception_brokes_test(exception):
+    return not isinstance(exception, (
+        AssertionError,
+        pytest.fail.Exception,
+        doctest.DocTestFailure
+    ))
diff --git a/allure-pytest/test/integration/pytest_doctest/pytest_doctest_test.py b/allure-pytest/test/integration/pytest_doctest/pytest_doctest_test.py
@@ -22,3 +22,46 @@ def some_func():
                 has_test_case("test_pytest_doctest.some_func",
                               with_status("passed"))
                 )
+
+
+@allure.feature("Integration")
+def test_pytest_doctest_failed(allured_testdir):
+    allured_testdir.testdir.makepyfile('''
+        def some_func():
+            """
+            >>> some_func()
+            True
+            """
+            return not True
+
+    ''')
+
+    allured_testdir.run_with_allure("--doctest-modules")
+
+    assert_that(
+        allured_testdir.allure_report,
+        has_test_case(
+            "test_pytest_doctest_failed.some_func",
+            with_status("failed")
+        )
+    )
+
+
+@allure.feature("Integration")
+def test_pytest_doctest_broken(allured_testdir):
+    allured_testdir.testdir.makepyfile('''
+        def some_func():
+            """
+            >>> raise ValueError()
+            """
+    ''')
+
+    allured_testdir.run_with_allure("--doctest-modules")
+
+    assert_that(
+        allured_testdir.allure_report,
+        has_test_case(
+            "test_pytest_doctest_broken.some_func",
+            with_status("broken")
+        )
+    )
