jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set type of log_print ini-variable to 'bool'

This commit is contained in:
Thomas Hisch 2017-09-13 18:09:27 +02:00
parent 3e71a50403
commit 36cceeb10e
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_pytest/logging.py
View File

@ -25,14 +25,15 @@ def pytest_addoption(parser):
group = parser.getgroup('logging') group = parser.getgroup('logging')
def add_option_ini(option, dest, default=None, **kwargs): def add_option_ini(option, dest, default=None, type=None, **kwargs):
parser.addini(dest, default=default, parser.addini(dest, default=default, type=type,
help='default value for ' + option) help='default value for ' + option)
group.addoption(option, dest=dest, **kwargs) group.addoption(option, dest=dest, **kwargs)
add_option_ini( add_option_ini(
'--no-print-logs', '--no-print-logs',
dest='log_print', action='store_const', const=False, default=True, dest='log_print', action='store_const', const=False, default=True,
type='bool',
help='disable printing caught logs on failed tests.') help='disable printing caught logs on failed tests.')
add_option_ini( add_option_ini(
'--log-level', '--log-level',
@ -329,13 +330,7 @@ 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.
""" """
print_logs = get_option_ini(config, 'log_print') self.print_logs = get_option_ini(config, 'log_print')
if not isinstance(print_logs, bool):
if print_logs.lower() in ('true', 'yes', '1'):
print_logs = True
elif print_logs.lower() in ('false', 'no', '0'):
print_logs = False
self.print_logs = print_logs
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'))