p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terminal: some minor code cleanups 

No logical changed intended.
This commit is contained in:
Ran Benita 2024-04-27 01:41:45 +03:00
parent 2a809e6f8b
commit 1a84d233f3
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/_pytest/terminal.py
View File

@ -432,7 +432,7 @@ class TerminalReporter:
char = {"xfailed": "x", "skipped": "s"}.get(char, char) char = {"xfailed": "x", "skipped": "s"}.get(char, char)
return char in self.reportchars return char in self.reportchars
def write_fspath_result(self, nodeid: str, res, **markup: bool) -> None: def write_fspath_result(self, nodeid: str, res: str, **markup: bool) -> None:
fspath = self.config.rootpath / nodeid.split("::")[0] fspath = self.config.rootpath / nodeid.split("::")[0]
if self.currentfspath is None or fspath != self.currentfspath: if self.currentfspath is None or fspath != self.currentfspath:
if self.currentfspath is not None and self._show_progress_info: if self.currentfspath is not None and self._show_progress_info:
@ -565,10 +565,11 @@ class TerminalReporter:
def pytest_runtest_logstart( def pytest_runtest_logstart(
self, nodeid: str, location: Tuple[str, Optional[int], str] self, nodeid: str, location: Tuple[str, Optional[int], str]
) -> None: ) -> None:
fspath, lineno, domain = location
# Ensure that the path is printed before the # Ensure that the path is printed before the
# 1st test of a module starts running. # 1st test of a module starts running.
if self.showlongtestinfo: if self.showlongtestinfo:
line = self._locationline(nodeid, *location) line = self._locationline(nodeid, fspath, lineno, domain)
self.write_ensure_prefix(line, "") self.write_ensure_prefix(line, "")
self.flush() self.flush()
elif self.showfspath: elif self.showfspath:
@ -591,7 +592,6 @@ class TerminalReporter:
if not letter and not word: if not letter and not word:
# Probably passed setup/teardown. # Probably passed setup/teardown.
return return
running_xdist = hasattr(rep, "node")
if markup is None: if markup is None:
was_xfail = hasattr(report, "wasxfail") was_xfail = hasattr(report, "wasxfail")
if rep.passed and not was_xfail: if rep.passed and not was_xfail:
@ -609,6 +609,7 @@ class TerminalReporter:
else: else:
self._progress_nodeids_reported.add(rep.nodeid) self._progress_nodeids_reported.add(rep.nodeid)
line = self._locationline(rep.nodeid, *rep.location) line = self._locationline(rep.nodeid, *rep.location)
running_xdist = hasattr(rep, "node")
if not running_xdist: if not running_xdist:
self.write_ensure_prefix(line, word, **markup) self.write_ensure_prefix(line, word, **markup)
if rep.skipped or hasattr(report, "wasxfail"): if rep.skipped or hasattr(report, "wasxfail"):
@ -649,38 +650,26 @@ class TerminalReporter:
return len(self._progress_nodeids_reported) == self._session.testscollected return len(self._progress_nodeids_reported) == self._session.testscollected
def pytest_runtest_logfinish(self, nodeid: str) -> None: def pytest_runtest_logfinish(self, nodeid: str) -> None:
assert self._session
if ( if (
self.config.get_verbosity(Config.VERBOSITY_TEST_CASES) <= 0 self.config.get_verbosity(Config.VERBOSITY_TEST_CASES) <= 0
and self._show_progress_info and self._show_progress_info
): ):
if self._show_progress_info == "count":
num_tests = self._session.testscollected
progress_length = len(f" [{num_tests}/{num_tests}]")
else:
progress_length = len(" [100%]")
self._progress_nodeids_reported.add(nodeid) self._progress_nodeids_reported.add(nodeid)
if self._is_last_item: if self._is_last_item:
self._write_progress_information_filling_space() self._write_progress_information_filling_space()
else: else:
main_color, _ = self._get_main_color() self._write_progress_information_if_past_edge()
w = self._width_of_current_line
past_edge = w + progress_length + 1 >= self._screen_width
if past_edge:
msg = self._get_progress_information_message()
self._tw.write(msg + "\n", **{main_color: True})
def _get_progress_information_message(self) -> str: def _get_progress_information_message(self) -> str:
assert self._session assert self._session
collected = self._session.testscollected collected = self._session.testscollected
if self._show_progress_info == "count": if self._show_progress_info == "count":
if collected: if collected:
progress = self._progress_nodeids_reported progress = len(self._progress_nodeids_reported)
counter_format = f"{{:{len(str(collected))}d}}" counter_format = f"{{:{len(str(collected))}d}}"
format_string = f" [{counter_format}/{{}}]" format_string = f" [{counter_format}/{{}}]"
return format_string.format(len(progress), collected) return format_string.format(progress, collected)
return f" [ {collected} / {collected} ]" return f" [ {collected} / {collected} ]"
else: else:
if collected: if collected:
@ -689,6 +678,20 @@ class TerminalReporter:
) )
return " [100%]" return " [100%]"
def _write_progress_information_if_past_edge(self) -> None:
w = self._width_of_current_line
if self._show_progress_info == "count":
assert self._session
num_tests = self._session.testscollected
progress_length = len(f" [{num_tests}/{num_tests}]")
else:
progress_length = len(" [100%]")
past_edge = w + progress_length + 1 >= self._screen_width
if past_edge:
main_color, _ = self._get_main_color()
msg = self._get_progress_information_message()
self._tw.write(msg + "\n", **{main_color: True})
def _write_progress_information_filling_space(self) -> None: def _write_progress_information_filling_space(self) -> None:
color, _ = self._get_main_color() color, _ = self._get_main_color()
msg = self._get_progress_information_message() msg = self._get_progress_information_message()
@ -937,7 +940,7 @@ class TerminalReporter:
line += "[".join(values) line += "[".join(values)
return line return line
# collect_fspath comes from testid which has a "/"-normalized path. # fspath comes from testid which has a "/"-normalized path.
if fspath: if fspath:
res = mkrel(nodeid) res = mkrel(nodeid)
if self.verbosity >= 2 and nodeid.split("::")[0] != fspath.replace( if self.verbosity >= 2 and nodeid.split("::")[0] != fspath.replace(