Skip to content

Commit eda5c2a

Browse files
committed
Remove terminal_reporter workaroundd from logging.py
The workaround was removed form the logging module by creating python properties for verbosity related settings in the terminalreporter. Closes: #4733
1 parent a1fcd6e commit eda5c2a

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/_pytest/logging.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -435,13 +435,6 @@ def _setup_cli_logging(self):
435435
# terminal reporter is disabled e.g. by pytest-xdist.
436436
return
437437

438-
# FIXME don't set verbosity level and derived attributes of
439-
# terminalwriter directly
440-
terminal_reporter.verbosity = config.option.verbose
441-
terminal_reporter.showheader = terminal_reporter.verbosity >= 0
442-
terminal_reporter.showfspath = terminal_reporter.verbosity >= 0
443-
terminal_reporter.showlongtestinfo = terminal_reporter.verbosity > 0
444-
445438
capture_manager = config.pluginmanager.get_plugin("capturemanager")
446439
# if capturemanager plugin is disabled, live logging still works.
447440
log_cli_handler = _LiveLoggingStreamHandler(terminal_reporter, capture_manager)

src/_pytest/terminal.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,6 @@ def __init__(self, config, file=None):
222222
import _pytest.config
223223

224224
self.config = config
225-
self.verbosity = self.config.option.verbose
226-
self.showheader = self.verbosity >= 0
227-
self.showfspath = self.verbosity >= 0
228-
self.showlongtestinfo = self.verbosity > 0
229225
self._numcollected = 0
230226
self._session = None
231227

@@ -255,6 +251,22 @@ def _determine_show_progress_info(self):
255251
return False
256252
return self.config.getini("console_output_style") in ("progress", "count")
257253

254+
@property
255+
def verbosity(self):
256+
return self.config.option.verbose
257+
258+
@property
259+
def showheader(self):
260+
return self.verbosity >= 0
261+
262+
@property
263+
def showfspath(self):
264+
return self.verbosity >= 0
265+
266+
@property
267+
def showlongtestinfo(self):
268+
return self.verbosity > 0
269+
258270
def hasopt(self, char):
259271
char = {"xfailed": "x", "skipped": "s"}.get(char, char)
260272
return char in self.reportchars

0 commit comments

Comments
 (0)