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

Merge pull request #3028 from thisch/removelogger 

Remove logger parameter from catching_logs
This commit is contained in:
Bruno Oliveira 2017-12-13 20:56:48 -02:00 committed by GitHub
parent 476d4df1b7 3862b0b28d
commit b17c6e5f89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
_pytest/logging.py
View File

@ -79,10 +79,9 @@ def pytest_addoption(parser):
@contextmanager @contextmanager
def catching_logs(handler, formatter=None, def catching_logs(handler, formatter=None, level=logging.NOTSET):
level=logging.NOTSET, logger=None):
"""Context manager that prepares the whole logging machinery properly.""" """Context manager that prepares the whole logging machinery properly."""
logger = logger or logging.getLogger(logger) root_logger = logging.getLogger()
if formatter is not None: if formatter is not None:
handler.setFormatter(formatter) handler.setFormatter(formatter)
@ -90,18 +89,18 @@ def catching_logs(handler, formatter=None,
# Adding the same handler twice would confuse logging system. # Adding the same handler twice would confuse logging system.
# Just don't do that. # Just don't do that.
add_new_handler = handler not in logger.handlers add_new_handler = handler not in root_logger.handlers
if add_new_handler: if add_new_handler:
logger.addHandler(handler) root_logger.addHandler(handler)
orig_level = logger.level orig_level = root_logger.level
logger.setLevel(min(orig_level, level)) root_logger.setLevel(min(orig_level, level))
try: try:
yield handler yield handler
finally: finally:
logger.setLevel(orig_level) root_logger.setLevel(orig_level)
if add_new_handler: if add_new_handler:
logger.removeHandler(handler) root_logger.removeHandler(handler)
class LogCaptureHandler(logging.StreamHandler): class LogCaptureHandler(logging.StreamHandler):