Skip to content

Commit 8f5d708

Browse files
committed
Simplify method
1 parent afc9fa5 commit 8f5d708

File tree

1 file changed

+30
-35
lines changed

1 file changed

+30
-35
lines changed

src/pytest_bdd/gherkin_terminal_reporter.py

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -58,45 +58,40 @@ def pytest_runtest_logreport(self, report: TestReport) -> Any:
5858

5959
if isinstance(word, tuple):
6060
word, word_markup = word
61-
else:
62-
if rep.passed:
63-
word_markup = {"green": True}
64-
elif rep.failed:
65-
word_markup = {"red": True}
66-
elif rep.skipped:
67-
word_markup = {"yellow": True}
61+
elif rep.passed:
62+
word_markup = {"green": True}
63+
elif rep.failed:
64+
word_markup = {"red": True}
65+
elif rep.skipped:
66+
word_markup = {"yellow": True}
6867
feature_markup = {"blue": True}
6968
scenario_markup = word_markup
7069

71-
if self.verbosity <= 0:
70+
if self.verbosity <= 0 or not hasattr(report, "scenario"):
7271
return super().pytest_runtest_logreport(rep)
73-
elif self.verbosity == 1:
74-
if hasattr(report, "scenario"):
75-
self.ensure_newline()
76-
self._tw.write("Feature: ", **feature_markup)
77-
self._tw.write(report.scenario["feature"]["name"], **feature_markup)
78-
self._tw.write("\n")
79-
self._tw.write(" Scenario: ", **scenario_markup)
80-
self._tw.write(report.scenario["name"], **scenario_markup)
81-
self._tw.write(" ")
82-
self._tw.write(word, **word_markup)
83-
self._tw.write("\n")
84-
else:
85-
return super().pytest_runtest_logreport(rep)
72+
73+
if self.verbosity == 1:
74+
self.ensure_newline()
75+
self._tw.write("Feature: ", **feature_markup)
76+
self._tw.write(report.scenario["feature"]["name"], **feature_markup)
77+
self._tw.write("\n")
78+
self._tw.write(" Scenario: ", **scenario_markup)
79+
self._tw.write(report.scenario["name"], **scenario_markup)
80+
self._tw.write(" ")
81+
self._tw.write(word, **word_markup)
82+
self._tw.write("\n")
8683
elif self.verbosity > 1:
87-
if hasattr(report, "scenario"):
88-
self.ensure_newline()
89-
self._tw.write("Feature: ", **feature_markup)
90-
self._tw.write(report.scenario["feature"]["name"], **feature_markup)
91-
self._tw.write("\n")
92-
self._tw.write(" Scenario: ", **scenario_markup)
93-
self._tw.write(report.scenario["name"], **scenario_markup)
94-
self._tw.write("\n")
95-
for step in report.scenario["steps"]:
96-
self._tw.write(f" {step['keyword']} {step['name']}\n", **scenario_markup)
97-
self._tw.write(" " + word, **word_markup)
98-
self._tw.write("\n\n")
99-
else:
100-
return super().pytest_runtest_logreport(rep)
84+
self.ensure_newline()
85+
self._tw.write("Feature: ", **feature_markup)
86+
self._tw.write(report.scenario["feature"]["name"], **feature_markup)
87+
self._tw.write("\n")
88+
self._tw.write(" Scenario: ", **scenario_markup)
89+
self._tw.write(report.scenario["name"], **scenario_markup)
90+
self._tw.write("\n")
91+
for step in report.scenario["steps"]:
92+
self._tw.write(f" {step['keyword']} {step['name']}\n", **scenario_markup)
93+
self._tw.write(" " + word, **word_markup)
94+
self._tw.write("\n\n")
95+
10196
self.stats.setdefault(cat, []).append(rep)
10297
return None

0 commit comments

Comments
 (0)