Merge pull request #57 from pytest-dev/log-lineno

Log line number fix and added better contextual support for PyQt5

Author: nicoddemus

pytestqt/_tests/test_logging.py

@@ -3,7 +3,7 @@
 import pytest
 
 from pytestqt.qt_compat import qDebug, qWarning, qCritical, QtDebugMsg, \
-    QtWarningMsg, QtCriticalMsg
+    QtWarningMsg, QtCriticalMsg, QT_API
 
 pytest_plugins = 'pytester'
 
@@ -36,9 +36,9 @@ def test_types():
         if qt_log:
             res.stdout.fnmatch_lines([
                 '*-- Captured Qt messages --*',
-                'QtDebugMsg: this is a DEBUG message*',
-                'QtWarningMsg: this is a WARNING message*',
-                'QtCriticalMsg: this is a CRITICAL message*',
+                '*QtDebugMsg: this is a DEBUG message*',
+                '*QtWarningMsg: this is a WARNING message*',
+                '*QtCriticalMsg: this is a CRITICAL message*',
             ])
         else:
             res.stdout.fnmatch_lines([
@@ -291,3 +291,66 @@ def test1():
     res = testdir.inline_run()
     passed = 1 if apply_mark else 0
     res.assertoutcome(passed=passed, failed=int(not passed))
+
+
+def test_lineno_failure(testdir):
+    """
+    Test that tests when failing because log messages were emitted report
+    the correct line number.
+
+    :type testdir: _pytest.pytester.TmpTestdir
+    """
+    testdir.makeini(
+        """
+        [pytest]
+        qt_log_level_fail = WARNING
+        """
+    )
+    testdir.makepyfile(
+        """
+        from pytestqt.qt_compat import qWarning
+        def test_foo():
+            assert foo() == 10
+        def foo():
+            qWarning('this is a WARNING message')
+            return 10
+        """
+    )
+    res = testdir.runpytest()
+    if QT_API == 'pyqt5':
+        res.stdout.fnmatch_lines([
+            '*test_lineno_failure.py:2: Failure*',
+            '*test_lineno_failure.py:foo:5:*',
+            '    QtWarningMsg: this is a WARNING message',
+        ])
+    else:
+        res.stdout.fnmatch_lines('*test_lineno_failure.py:2: Failure*')
+
+
+@pytest.mark.skipif(QT_API != 'pyqt5',
+                    reason='Context information only available in PyQt5')
+def test_context_none(testdir):
+    """
+    Sometimes PyQt5 will emit a context with some/all attributes set as None
+    instead of appropriate file, function and line number.
+
+    Test that when this happens the plugin doesn't break.
+
+    :type testdir: _pytest.pytester.TmpTestdir
+    """
+    testdir.makepyfile(
+        """
+        from pytestqt.qt_compat import QtWarningMsg
+
+        def test_foo(request):
+            log_capture = request.node.qt_log_capture
+            context = log_capture._Context(None, None, None)
+            log_capture._handle(QtWarningMsg, "WARNING message", context)
+            assert 0
+        """
+    )
+    res = testdir.runpytest()
+    res.stdout.fnmatch_lines([
+        '*Failure*',
+        '*None:None:None:*',
+    ])

pytestqt/plugin.py

@@ -1,3 +1,4 @@
+from collections import namedtuple
 from contextlib import contextmanager
 import functools
 import sys
@@ -568,8 +569,12 @@ def pytest_addoption(parser):
 
     parser.addoption('--no-qt-log', dest='qt_log', action='store_false',
                      default=True)
-    parser.addoption('--qt-log-format', dest='qt_log_format',
-                     default='{rec.type_name}: {rec.message}')
+    if QT_API == 'pyqt5':
+        default = '{rec.context.file}:{rec.context.function}:' \
+                  '{rec.context.line}:\n    {rec.type_name}: {rec.message}'
+    else:
+        default = '{rec.type_name}: {rec.message}'
+    parser.addoption('--qt-log-format', dest='qt_log_format', default=default)
 
 
 @pytest.mark.hookwrapper
@@ -671,7 +676,8 @@ def pytest_runtest_makereport(self, item, call):
                     lines = []
                     for rec in item.qt_log_capture.records:
                         suffix = ' (IGNORED)' if rec.ignored else ''
-                        lines.append(log_format.format(rec=rec) + suffix)
+                        line = log_format.format(rec=rec) + suffix
+                        lines.append(line)
                     if lines:
                         long_repr.addsection('Captured Qt messages',
                                              '\n'.join(lines))
@@ -695,21 +701,34 @@ def __init__(self, ignore_regexes):
         self._records = []
         self._ignore_regexes = ignore_regexes or []
 
-    def _handle(self, msg_type, message):
+    _Context = namedtuple('_Context', 'file function line')
+
+    def _handle(self, msg_type, message, context=None):
         """
         Method to be installed using qInstallMsgHandler, stores each message
         into the `messages` attribute.
         """
-        if isinstance(message, bytes):
-            message = message.decode('utf-8', 'replace')
+        def to_unicode(s):
+            if isinstance(s, bytes):
+                s = s.decode('utf-8', 'replace')
+            return s
+
+        message = to_unicode(message)
 
         ignored = False
         for regex in self._ignore_regexes:
             if re.search(regex, message) is not None:
                 ignored = True
                 break
 
-        self._records.append(Record(msg_type, message, ignored))
+        if context is not None:
+            context = self._Context(
+                to_unicode(context.file),
+                to_unicode(context.function),
+                context.line,
+            )
+
+        self._records.append(Record(msg_type, message, ignored, context))
 
     @property
     def records(self):
@@ -733,22 +752,26 @@ class Record(object):
     :ivar datetime.datetime when: when the message was captured
     :ivar bool ignored: If this record matches a regex from the "qt_log_ignore"
         option.
+    :ivar context: a namedtuple containing the attributes ``file``,
+        ``function``, ``line``. Only available in Qt5, otherwise is None.
     """
 
-    def __init__(self, msg_type, message, ignored):
+    def __init__(self, msg_type, message, ignored, context):
         self._type = msg_type
         self._message = message
         self._type_name = self._get_msg_type_name(msg_type)
         self._log_type_name = self._get_log_type_name(msg_type)
         self._when = datetime.datetime.now()
         self._ignored = ignored
+        self._context = context
 
     message = property(lambda self: self._message)
     type = property(lambda self: self._type)
     type_name = property(lambda self: self._type_name)
     log_type_name = property(lambda self: self._log_type_name)
     when = property(lambda self: self._when)
     ignored = property(lambda self: self._ignored)
+    context = property(lambda self: self._context)
 
     @classmethod
     def _get_msg_type_name(cls, msg_type):
@@ -799,8 +822,9 @@ class _QtLogLevelErrorRepr(TerminalRepr):
 
     def __init__(self, item, level):
         msg = 'Failure: Qt messages with level {0} or above emitted'
-        path, line, _ = item.location
-        self.fileloc = ReprFileLocation(path, line, msg.format(level.upper()))
+        path, line_index, _ = item.location
+        self.fileloc = ReprFileLocation(path, lineno=line_index + 1,
+                                        message=msg.format(level.upper()))
         self.sections = []
 
     def addsection(self, name, content, sep="-"):

pytestqt/qt_compat.py

@@ -101,7 +101,7 @@ def qInstallMsgHandler(handler):
                 message handler's signature.
                 """
                 def _Qt5MessageHandler(msg_type, context, msg):
-                    handler(msg_type, msg)
+                    handler(msg_type, msg, context)
                 if handler is not None:
                     return QtCore.qInstallMessageHandler(_Qt5MessageHandler)
                 else: