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

Improve get_option_ini and get_actual_log_level

This commit is contained in:
Thomas Hisch 2017-09-26 22:58:26 +02:00
parent 69f3bd8336
commit 0ec72d0745
1 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
_pytest/logging.py
View File

@ -3,6 +3,7 @@ from __future__ import absolute_import, division, print_function
import logging import logging
from contextlib import closing, contextmanager from contextlib import closing, contextmanager
import sys import sys
import six
import pytest import pytest
import py import py
@ -12,12 +13,13 @@ DEFAULT_LOG_FORMAT = '%(filename)-25s %(lineno)4d %(levelname)-8s %(message)s'
DEFAULT_LOG_DATE_FORMAT = '%H:%M:%S' DEFAULT_LOG_DATE_FORMAT = '%H:%M:%S'
def get_option_ini(config, name): def get_option_ini(config, *names):
ret = config.getoption(name) # 'default' arg won't work as expected for name in names:
if ret is None: ret = config.getoption(name) # 'default' arg won't work as expected
ret = config.getini(name) if ret is None:
return ret ret = config.getini(name)
if ret:
return ret
def pytest_addoption(parser): def pytest_addoption(parser):
"""Add options to control log capturing.""" """Add options to control log capturing."""
@ -221,12 +223,19 @@ def caplog(request):
return LogCaptureFixture(request.node) return LogCaptureFixture(request.node)
def get_actual_log_level(config, setting_name): def get_actual_log_level(config, *setting_names):
"""Return the actual logging level.""" """Return the actual logging level."""
log_level = get_option_ini(config, setting_name)
if not log_level: for setting_name in setting_names:
log_level = config.getoption(setting_name)
if log_level is None:
log_level = config.getini(setting_name)
if log_level:
break
else:
return return
if isinstance(log_level, py.builtin.text):
if isinstance(log_level, six.string_types):
log_level = log_level.upper() log_level = log_level.upper()
try: try:
return int(getattr(logging, log_level, log_level)) return int(getattr(logging, log_level, log_level))
@ -254,15 +263,8 @@ class LoggingPlugin(object):
The formatter can be safely shared across all handlers so The formatter can be safely shared across all handlers so
create a single one for the entire test session here. create a single one for the entire test session here.
""" """
log_cli_level = get_actual_log_level(config, 'log_cli_level') self.log_cli_level = get_actual_log_level(
if log_cli_level is None: config, 'log_cli_level', 'log_level') or logging.WARNING
# No specific CLI logging level was provided, let's check
# log_level for a fallback
log_cli_level = get_actual_log_level(config, 'log_level')
if log_cli_level is None:
# No log_level was provided, default to WARNING
log_cli_level = logging.WARNING
self.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(
@ -270,14 +272,10 @@ class LoggingPlugin(object):
get_option_ini(config, 'log_date_format')) get_option_ini(config, 'log_date_format'))
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(
if not log_cli_format: config, 'log_cli_format', 'log_format')
# No CLI specific format was provided, use log_format log_cli_date_format = get_option_ini(
log_cli_format = get_option_ini(config, 'log_format') config, 'log_cli_date_format', 'log_date_format')
log_cli_date_format = get_option_ini(config, 'log_cli_date_format')
if not log_cli_date_format:
# No CLI specific date format was provided, use log_date_format
log_cli_date_format = get_option_ini(config, 'log_date_format')
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)
@ -288,20 +286,13 @@ class LoggingPlugin(object):
log_file = get_option_ini(config, 'log_file') log_file = get_option_ini(config, 'log_file')
if log_file: if log_file:
log_file_level = get_actual_log_level(config, 'log_file_level') self.log_file_level = get_actual_log_level(
if log_file_level is None: config, 'log_file_level') or logging.WARNING
# No log_level was provided, default to WARNING
log_file_level = logging.WARNING
self.log_file_level = log_file_level
log_file_format = get_option_ini(config, 'log_file_format') log_file_format = get_option_ini(
if not log_file_format: config, 'log_file_format', 'log_format')
# No log file specific format was provided, use log_format log_file_date_format = get_option_ini(
log_file_format = get_option_ini(config, 'log_format') config, 'log_file_date_format', 'log_date_format')
log_file_date_format = get_option_ini(config, 'log_file_date_format')
if not log_file_date_format:
# No log file specific date format was provided, use log_date_format
log_file_date_format = get_option_ini(config, 'log_date_format')
self.log_file_handler = logging.FileHandler( self.log_file_handler = logging.FileHandler(
log_file, log_file,
# Each pytest runtests session will write to a clean logfile # Each pytest runtests session will write to a clean logfile