now XFAIL messages contains reason same as XPASS (via allure-framework#519)

skhomuti · web-flow · commit 3ffb2047b54a · 2020-11-18T15:15:03.000+03:00
diff --git a/allure-pytest/src/listener.py b/allure-pytest/src/listener.py
@@ -168,9 +168,14 @@ def pytest_runtest_makereport(self, item, call):
         status_details = None
 
         if call.excinfo:
+            message = escape_non_unicode_symbols(call.excinfo.exconly())
+            if hasattr(report, 'wasxfail'):
+                reason = report.wasxfail
+                message = ('XFAIL {}'.format(reason) if reason else 'XFAIL') + '\n\n' + message
+            trace = escape_non_unicode_symbols(report.longreprtext)
             status_details = StatusDetails(
-                message=escape_non_unicode_symbols(call.excinfo.exconly()),
-                trace=escape_non_unicode_symbols(report.longreprtext))
+                message=message,
+                trace=trace)
             if (status != Status.SKIPPED
                 and not (call.excinfo.errisinstance(AssertionError)
                          or call.excinfo.errisinstance(pytest.fail.Exception))):
diff --git a/allure-pytest/test/acceptance/status/xfail_call_status_test.py b/allure-pytest/test/acceptance/status/xfail_call_status_test.py
@@ -19,29 +19,31 @@ def test_xfail(executed_docstring_source):
     assert_that(executed_docstring_source.allure_report,
                 has_test_case("test_xfail_example",
                               with_status("skipped"),
-                              has_status_details(with_message_contains("AssertionError"),
+                              has_status_details(with_message_contains("XFAIL"),
+                                                 with_message_contains("AssertionError"),
                                                  with_trace_contains("def test_xfail_example():")
                                                  )
                               )
                 )
 
 
-def test_xfail_raise_mentioned_exception(executed_docstring_source):
+def test_xfail_with_reason_raise_mentioned_exception(executed_docstring_source):
     """
     >>> import pytest
 
-    >>> @pytest.mark.xfail(raises=AssertionError)
-    ... def test_xfail_raise_mentioned_exception_example():
+    >>> @pytest.mark.xfail(raises=AssertionError, reason='Some reason')
+    ... def test_xfail_with_reason_raise_mentioned_exception_example():
     ...     assert False
 
     """
 
     assert_that(executed_docstring_source.allure_report,
-                has_test_case("test_xfail_raise_mentioned_exception_example",
+                has_test_case("test_xfail_with_reason_raise_mentioned_exception_example",
                               with_status("skipped"),
-                              has_status_details(with_message_contains("AssertionError"),
+                              has_status_details(with_message_contains("XFAIL Some reason"),
+                                                 with_message_contains("AssertionError"),
                                                  with_trace_contains(
-                                                     "def test_xfail_raise_mentioned_exception_example():")
+                                                     "def test_xfail_with_reason_raise_mentioned_exception_example():")
                                                  )
                               )
                 )

Original file line number	Diff line number	Diff line change
`@@ -19,29 +19,31 @@ def test_xfail(executed_docstring_source):`
`19`	`19`	`assert_that(executed_docstring_source.allure_report,`
`20`	`20`	`has_test_case("test_xfail_example",`
`21`	`21`	`with_status("skipped"),`
`22`		`- has_status_details(with_message_contains("AssertionError"),`
	`22`	`+ has_status_details(with_message_contains("XFAIL"),`
	`23`	`+ with_message_contains("AssertionError"),`
`23`	`24`	`with_trace_contains("def test_xfail_example():")`
`24`	`25`	`)`
`25`	`26`	`)`
`26`	`27`	`)`
`27`	`28`
`28`	`29`
`29`		`-def test_xfail_raise_mentioned_exception(executed_docstring_source):`
	`30`	`+def test_xfail_with_reason_raise_mentioned_exception(executed_docstring_source):`
`30`	`31`	`"""`
`31`	`32`	`>>> import pytest`
`32`	`33`
`33`		`- >>> @pytest.mark.xfail(raises=AssertionError)`
`34`		`- ... def test_xfail_raise_mentioned_exception_example():`
	`34`	`+ >>> @pytest.mark.xfail(raises=AssertionError, reason='Some reason')`
	`35`	`+ ... def test_xfail_with_reason_raise_mentioned_exception_example():`
`35`	`36`	`... assert False`
`36`	`37`
`37`	`38`	`"""`
`38`	`39`
`39`	`40`	`assert_that(executed_docstring_source.allure_report,`
`40`		`- has_test_case("test_xfail_raise_mentioned_exception_example",`
	`41`	`+ has_test_case("test_xfail_with_reason_raise_mentioned_exception_example",`
`41`	`42`	`with_status("skipped"),`
`42`		`- has_status_details(with_message_contains("AssertionError"),`
	`43`	`+ has_status_details(with_message_contains("XFAIL Some reason"),`
	`44`	`+ with_message_contains("AssertionError"),`
`43`	`45`	`with_trace_contains(`
`44`		`- "def test_xfail_raise_mentioned_exception_example():")`
	`46`	`+ "def test_xfail_with_reason_raise_mentioned_exception_example():")`
`45`	`47`	`)`
`46`	`48`	`)`
`47`	`49`	`)`