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

Fix for issue #11314. Use log_format as default for log_file_format

This commit is contained in:
Sharad Nair 2023-09-16 20:56:38 +05:30
parent 6c2feb75d2
commit 807af6b679
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/_pytest/logging.py
View File

@ -303,13 +303,13 @@ def pytest_addoption(parser: Parser) -> None:
add_option_ini( add_option_ini(
"--log-file-format", "--log-file-format",
dest="log_file_format", dest="log_file_format",
default=DEFAULT_LOG_FORMAT, default=None,
help="Log format used by the logging module", help="Log format used by the logging module",
) )
add_option_ini( add_option_ini(
"--log-file-date-format", "--log-file-date-format",
dest="log_file_date_format", dest="log_file_date_format",
default=DEFAULT_LOG_DATE_FORMAT, default=None,
help="Log date format used by the logging module", help="Log date format used by the logging module",
) )
add_option_ini( add_option_ini(
@ -635,7 +635,9 @@ class LoggingPlugin:
self.report_handler.setFormatter(self.formatter) self.report_handler.setFormatter(self.formatter)
# File logging. # File logging.
self.log_file_level = get_log_level_for_setting(config, "log_file_level") self.log_file_level = get_log_level_for_setting(
config, "log_file_level", "log_level"
)
log_file = get_option_ini(config, "log_file") or os.devnull log_file = get_option_ini(config, "log_file") or os.devnull
if log_file != os.devnull: if log_file != os.devnull:
directory = os.path.dirname(os.path.abspath(log_file)) directory = os.path.dirname(os.path.abspath(log_file))