floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow a progress bar even when capture=no

This commit is contained in:
Paul Kehrer 2023-02-20 16:19:27 -06:00
parent aa72496d24
commit 9c4be4fd58
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/_pytest/terminal.py
View File

@ -229,7 +229,8 @@ def pytest_addoption(parser: Parser) -> None:
parser.addini( parser.addini(
"console_output_style", "console_output_style",
help='Console output: "classic", or with additional progress information ' help='Console output: "classic", or with additional progress information '
'("progress" (percentage) | "count")', '("progress" (percentage) | "count" | "progress-even-when-capture-no" (forces '
'progress even when capture=no)',
default="progress", default="progress",
) )
@ -346,14 +347,19 @@ class TerminalReporter:
def _determine_show_progress_info(self) -> "Literal['progress', 'count', False]": def _determine_show_progress_info(self) -> "Literal['progress', 'count', False]":
"""Return whether we should display progress information based on the current config.""" """Return whether we should display progress information based on the current config."""
# do not show progress if we are not capturing output (#3038) # do not show progress if we are not capturing output (#3038) unless explicitly
if self.config.getoption("capture", "no") == "no": # overridden by progress-even-when-capture-no
if (
self.config.getoption("capture", "no") == "no"
and self.config.getini("console_output_style")
!= "progress-even-when-capture-no"
):
return False return False
# do not show progress if we are showing fixture setup/teardown # do not show progress if we are showing fixture setup/teardown
if self.config.getoption("setupshow", False): if self.config.getoption("setupshow", False):
return False return False
cfg: str = self.config.getini("console_output_style") cfg: str = self.config.getini("console_output_style")
if cfg == "progress": if cfg == "progress" or cfg == "progress-even-when-capture-no":
return "progress" return "progress"
elif cfg == "count": elif cfg == "count":
return "count" return "count"

18
testing/test_terminal.py
View File

@ -2213,6 +2213,24 @@ class TestProgressOutputStyle:
output = pytester.runpytest("--capture=no") output = pytester.runpytest("--capture=no")
output.stdout.no_fnmatch_line("*%]*") output.stdout.no_fnmatch_line("*%]*")
def test_capture_no_progress_enabled(
self, many_tests_files, pytester: Pytester
) -> None:
pytester.makeini(
"""
[pytest]
console_output_style = progress-even-when-capture-no
"""
)
output = pytester.runpytest("-s")
output.stdout.re_match_lines(
[
r"test_bar.py \.{10} \s+ \[ 50%\]",
r"test_foo.py \.{5} \s+ \[ 75%\]",
r"test_foobar.py \.{5} \s+ \[100%\]",
]
)
class TestProgressWithTeardown: class TestProgressWithTeardown:
"""Ensure we show the correct percentages for tests that fail during teardown (#3088)""" """Ensure we show the correct percentages for tests that fail during teardown (#3088)"""