Merge pull request #8128 from bluetech/skip-reason-empty

bluetech · web-flow · commit b47827577723 · 2020-12-12T22:18:06.000+02:00
terminal: when the skip/xfail is empty, don't show it as "()"
diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py
@@ -554,7 +554,7 @@ def pytest_runtest_logreport(self, report: TestReport) -> None:
                     )
                     reason = _get_raw_skip_reason(rep)
                     reason_ = _format_trimmed(" ({})", reason, available_width)
-                    if reason_ is not None:
+                    if reason and reason_ is not None:
                         self._tw.write(reason_)
                 if self._show_progress_info:
                     self._write_progress_information_filling_space()
diff --git a/testing/test_terminal.py b/testing/test_terminal.py
@@ -362,6 +362,10 @@ def test_2():
             @pytest.mark.xfail(reason="789")
             def test_3():
                 assert False
+
+            @pytest.mark.xfail(reason="")
+            def test_4():
+                assert False
         """
         )
         result = pytester.runpytest("-v")
@@ -370,6 +374,7 @@ def test_3():
                 "test_verbose_skip_reason.py::test_1 SKIPPED (123) *",
                 "test_verbose_skip_reason.py::test_2 XPASS (456) *",
                 "test_verbose_skip_reason.py::test_3 XFAIL (789) *",
+                "test_verbose_skip_reason.py::test_4 XFAIL  *",
             ]
         )
 

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ def pytest_runtest_logreport(self, report: TestReport) -> None:`
`554`	`554`	`)`
`555`	`555`	`reason = _get_raw_skip_reason(rep)`
`556`	`556`	`reason_ = _format_trimmed(" ({})", reason, available_width)`
`557`		`- if reason_ is not None:`
	`557`	`+ if reason and reason_ is not None:`
`558`	`558`	`self._tw.write(reason_)`
`559`	`559`	`if self._show_progress_info:`
`560`	`560`	`self._write_progress_information_filling_space()`
Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,10 @@ def test_2():`
`362`	`362`	`@pytest.mark.xfail(reason="789")`
`363`	`363`	`def test_3():`
`364`	`364`	`assert False`
	`365`	`+`
	`366`	`+ @pytest.mark.xfail(reason="")`
	`367`	`+ def test_4():`
	`368`	`+ assert False`
`365`	`369`	`"""`
`366`	`370`	`)`
`367`	`371`	`result = pytester.runpytest("-v")`
`@@ -370,6 +374,7 @@ def test_3():`
`370`	`374`	`"test_verbose_skip_reason.py::test_1 SKIPPED (123) *",`
`371`	`375`	`"test_verbose_skip_reason.py::test_2 XPASS (456) *",`
`372`	`376`	`"test_verbose_skip_reason.py::test_3 XFAIL (789) *",`
	`377`	`+ "test_verbose_skip_reason.py::test_4 XFAIL *",`
`373`	`378`	`]`
`374`	`379`	`)`
`375`	`380`