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

Remove _catchlog_ prefix

This commit is contained in:
Thomas Hisch 2017-09-15 03:11:56 +02:00
parent 87b8dc5afb
commit f1f6109255
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/logging.py
View File

@ -335,7 +335,7 @@ class LoggingPlugin(object):
if log_cli_level is None: if log_cli_level is None:
# No log_level was provided, default to WARNING # No log_level was provided, default to WARNING
log_cli_level = logging.WARNING log_cli_level = logging.WARNING
config._catchlog_log_cli_level = log_cli_level config.log_cli_level = log_cli_level
self.print_logs = get_option_ini(config, 'log_print') self.print_logs = get_option_ini(config, 'log_print')
self.formatter = logging.Formatter( self.formatter = logging.Formatter(
@ -361,7 +361,7 @@ class LoggingPlugin(object):
if log_file_level is None: if log_file_level is None:
# No log_level was provided, default to WARNING # No log_level was provided, default to WARNING
log_file_level = logging.WARNING log_file_level = logging.WARNING
config._catchlog_log_file_level = log_file_level config.log_file_level = log_file_level
log_file_format = get_option_ini(config, 'log_file_format') log_file_format = get_option_ini(config, 'log_file_format')
if not log_file_format: if not log_file_format:
@ -418,10 +418,10 @@ class LoggingPlugin(object):
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 catching_logs(self.log_cli_handler,
level=session.config._catchlog_log_cli_level): level=session.config.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=session.config._catchlog_log_file_level): level=session.config.log_file_level):
yield # run all the tests yield # run all the tests
else: else:
yield # run all the tests yield # run all the tests