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

Merge pull request #8010 from nicoddemus/pluralize

This commit is contained in:
Bruno Oliveira 2020-11-08 13:31:27 -03:00 committed by GitHub
parent 5b2e5e8a40 c7f8ad17f5
commit b2e7b9df9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/_pytest/terminal.py
View File

@ -1204,7 +1204,7 @@ class TerminalReporter:
count = len(reports) count = len(reports)
color = _color_for_type.get(key, _color_for_type_default) color = _color_for_type.get(key, _color_for_type_default)
markup = {color: True, "bold": color == main_color} markup = {color: True, "bold": color == main_color}
parts.append(("%d %s" % _make_plural(count, key), markup)) parts.append(("%d %s" % pluralize(count, key), markup))
if not parts: if not parts:
parts = [("no tests ran", {_color_for_type_default: True})] parts = [("no tests ran", {_color_for_type_default: True})]
@ -1223,9 +1223,7 @@ class TerminalReporter:
elif deselected == 0: elif deselected == 0:
main_color = "green" main_color = "green"
collected_output = "%d %s collected" % _make_plural( collected_output = "%d %s collected" % pluralize(self._numcollected, "test")
self._numcollected, "test"
)
parts = [(collected_output, {main_color: True})] parts = [(collected_output, {main_color: True})]
else: else:
all_tests_were_deselected = self._numcollected == deselected all_tests_were_deselected = self._numcollected == deselected
@ -1241,7 +1239,7 @@ class TerminalReporter:
if errors: if errors:
main_color = _color_for_type["error"] main_color = _color_for_type["error"]
parts += [("%d %s" % _make_plural(errors, "error"), {main_color: True})] parts += [("%d %s" % pluralize(errors, "error"), {main_color: True})]
return parts, main_color return parts, main_color
@ -1329,7 +1327,7 @@ _color_for_type = {
_color_for_type_default = "yellow" _color_for_type_default = "yellow"
def _make_plural(count: int, noun: str) -> Tuple[int, str]: def pluralize(count: int, noun: str) -> Tuple[int, str]:
# No need to pluralize words such as `failed` or `passed`. # No need to pluralize words such as `failed` or `passed`.
if noun not in ["error", "warnings", "test"]: if noun not in ["error", "warnings", "test"]:
return count, noun return count, noun