From bf06f4a4d79700d4532e7d5b4e81bf091b156b9a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 20 Jul 2016 14:19:27 +0200 Subject: [PATCH] tests: Use dedicated logger for message mock 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. --- tests/helpers/logfail.py | 3 +++ tests/helpers/messagemock.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/helpers/logfail.py b/tests/helpers/logfail.py index 3435018e0..96e74a94c 100644 --- a/tests/helpers/logfail.py +++ b/tests/helpers/logfail.py @@ -46,6 +46,9 @@ class LogFailHandler(logging.Handler): 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 diff --git a/tests/helpers/messagemock.py b/tests/helpers/messagemock.py index cf27cb8f1..531586cab 100644 --- a/tests/helpers/messagemock.py +++ b/tests/helpers/messagemock.py @@ -62,9 +62,7 @@ class MessageMock: } log_level = log_levels[level] - with self._caplog.at_level(log_level): # needed so we don't fail - logging.getLogger('message').log(log_level, text) - + logging.getLogger('messagemock').log(log_level, text) self.messages.append(Message(level, win_id, text, immediately)) def _handle_error(self, *args, **kwargs):