bf06f4a4d7
The message mock might handle a message during pytest-qt's processEvents
during test setup. If that happens, depending on the fixture order,
pytest-caplog might not be set up first, which is why the
self._caplog.at_level call can fail:
File "c:\projects\qutebrowser\qutebrowser\misc\guiprocess.py", line 105, in on_finished
immediately=True)
File "C:\projects\qutebrowser\tests\helpers\messagemock.py", line 71, in _handle_error
self._handle(Level.error, *args, **kwargs)
File "C:\projects\qutebrowser\tests\helpers\messagemock.py", line 65, in _handle
with self._caplog.at_level(log_level): # needed so we don't fail
File "C:\projects\qutebrowser\.tox\py34\lib\site-packages\pytest_catchlog.py", line 232, in at_level
obj = logger and logging.getLogger(logger) or self.handler
File "C:\projects\qutebrowser\.tox\py34\lib\site-packages\pytest_catchlog.py", line 186, in handler
return self._item.catch_log_handler
AttributeError: 'Function' object has no attribute 'catch_log_handler'
Full stack:
c:\projects\qutebrowser-git\.tox\py34\lib\site-packages\pytestqt\plugin.py(100)pytest_runtest_setup()
-> _process_events()
c:\projects\qutebrowser-git\.tox\py34\lib\site-packages\pytestqt\plugin.py(140)_process_events()
-> app.processEvents()
c:\projects\qutebrowser-git\qutebrowser\misc\guiprocess.py(94)on_error()
-> self._what, msg), immediately=True)
c:\projects\qutebrowser-git\tests\helpers\messagemock.py(71)_handle_error()
-> self._handle(Level.error, *args, **kwargs)
c:\projects\qutebrowser-git\tests\helpers\messagemock.py(65)_handle()
-> with self._caplog.at_level(log_level): # needed so we don't fail
c:\projects\qutebrowser-git\.tox\py34\lib\site-packages\pytest_catchlog.py(235)at_level()
-> obj = logger and logging.getLogger(logger) or self.handler
> c:\projects\qutebrowser-git\.tox\py34\lib\site-packages\pytest_catchlog.py(189)handler()->None
This should fix broken AppVeyor builds.
Fixes #1662.
80 lines
2.6 KiB
Python
80 lines
2.6 KiB
Python
# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
|
|
|
|
# Copyright 2015-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
|
|
#
|
|
# This file is part of qutebrowser.
|
|
#
|
|
# qutebrowser is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# qutebrowser is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
"""Logging handling for the tests."""
|
|
|
|
import logging
|
|
|
|
import pytest
|
|
|
|
try:
|
|
import pytest_catchlog as catchlog_mod
|
|
except ImportError:
|
|
# When using pytest for pyflakes/pep8/..., the plugin won't be available
|
|
# but conftest.py will still be loaded.
|
|
#
|
|
# However, LogFailHandler.emit will never be used in that case, so we just
|
|
# ignore the ImportError.
|
|
pass
|
|
|
|
|
|
class LogFailHandler(logging.Handler):
|
|
|
|
"""A logging handler which makes tests fail on unexpected messages."""
|
|
|
|
def __init__(self, level=logging.NOTSET, min_level=logging.WARNING):
|
|
self._min_level = min_level
|
|
super().__init__(level)
|
|
|
|
def emit(self, record):
|
|
logger = logging.getLogger(record.name)
|
|
root_logger = logging.getLogger()
|
|
|
|
if logger.name == 'messagemock':
|
|
return
|
|
|
|
for h in root_logger.handlers:
|
|
if isinstance(h, catchlog_mod.LogCaptureHandler):
|
|
catchlog_handler = h
|
|
break
|
|
else:
|
|
# The LogCaptureHandler is not available anymore during fixture
|
|
# teardown, so we ignore logging messages emitted there..
|
|
return
|
|
|
|
if (logger.level == record.levelno or
|
|
catchlog_handler.level == record.levelno):
|
|
# caplog.at_level(...) was used with the level of this message,
|
|
# i.e. it was expected.
|
|
return
|
|
if record.levelno < self._min_level:
|
|
return
|
|
pytest.fail("Got logging message on logger {} with level {}: "
|
|
"{}!".format(record.name, record.levelname,
|
|
record.getMessage()))
|
|
|
|
|
|
@pytest.yield_fixture(scope='session', autouse=True)
|
|
def fail_on_logging():
|
|
handler = LogFailHandler()
|
|
logging.getLogger().addHandler(handler)
|
|
yield
|
|
logging.getLogger().removeHandler(handler)
|
|
handler.close()
|