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

Introduce live_logs context manager

This commit is contained in:
Thomas Hisch 2017-09-15 12:45:25 +02:00
parent 08f6b5f4ea
commit e41fd52e8c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
_pytest/logging.py
View File

@ -341,7 +341,8 @@ class LoggingPlugin(object):
self.formatter = logging.Formatter( self.formatter = logging.Formatter(
get_option_ini(config, 'log_format'), get_option_ini(config, 'log_format'),
get_option_ini(config, 'log_date_format')) get_option_ini(config, 'log_date_format'))
self.log_cli_handler = logging.StreamHandler(sys.stderr)
log_cli_handler = logging.StreamHandler(sys.stderr)
log_cli_format = get_option_ini(config, 'log_cli_format') log_cli_format = get_option_ini(config, 'log_cli_format')
if not log_cli_format: if not log_cli_format:
# No CLI specific format was provided, use log_format # No CLI specific format was provided, use log_format
@ -353,7 +354,10 @@ class LoggingPlugin(object):
log_cli_formatter = logging.Formatter( log_cli_formatter = logging.Formatter(
log_cli_format, log_cli_format,
datefmt=log_cli_date_format) datefmt=log_cli_date_format)
self.log_cli_handler.setFormatter(log_cli_formatter) log_cli_handler.setFormatter(log_cli_formatter)
self.log_cli_handler = log_cli_handler # needed for a single unittest
self.live_logs = catching_logs(log_cli_handler,
level=self.log_cli_level)
log_file = get_option_ini(config, 'log_file') log_file = get_option_ini(config, 'log_file')
if log_file: if log_file:
@ -417,8 +421,7 @@ class LoggingPlugin(object):
@pytest.hookimpl(hookwrapper=True) @pytest.hookimpl(hookwrapper=True)
def pytest_runtestloop(self, session): def pytest_runtestloop(self, session):
"""Runs all collected test items.""" """Runs all collected test items."""
with catching_logs(self.log_cli_handler, with self.live_logs:
level=self.log_cli_level):
if self.log_file_handler is not None: if self.log_file_handler is not None:
with catching_logs(self.log_file_handler, with catching_logs(self.log_file_handler,
level=self.log_file_level): level=self.log_file_level):