Merge pull request #230 from nicoddemus/release-3.0.2

Release 3.0.2

CHANGELOG.rst

@@ -1,3 +1,9 @@
+3.0.2 (2018-08-31)
+------------------
+
+- Another fix related to ``QtInfoMsg`` objects during logging (`#225`_).
+
+
 3.0.1 (2018-08-30)
 ------------------
 

pytestqt/logging.py

@@ -14,7 +14,7 @@ class QtLoggingPlugin(object):
     test and augment reporting if the test failed with the messages captured.
     """
 
-    LOG_FAIL_OPTIONS = ['NO', 'CRITICAL', 'WARNING', 'DEBUG']
+    LOG_FAIL_OPTIONS = ['NO', 'CRITICAL', 'WARNING', 'DEBUG', 'INFO']
 
     def __init__(self, config):
         self.config = config
@@ -199,10 +199,10 @@ class Record(object):
 
     :ivar str message: message contents.
     :ivar Qt.QtMsgType type: enum that identifies message type
-    :ivar str type_name: ``type`` as string: ``"QtDebugMsg"``,
+    :ivar str type_name: ``type`` as string: ``"QtInfoMsg"``, ``"QtDebugMsg"``,
         ``"QtWarningMsg"`` or ``"QtCriticalMsg"``.
     :ivar str log_type_name:
-        type name similar to the logging package: ``DEBUG``,
+        type name similar to the logging package: ``INFO``, ``DEBUG``,
         ``WARNING`` and ``CRITICAL``.
     :ivar datetime.datetime when: when the message was captured
     :ivar bool ignored: If this record matches a regex from the "qt_log_ignore"
@@ -258,11 +258,15 @@ def _get_log_type_name(cls, msg_type):
                 qt_api.QtCriticalMsg: 'CRITICAL',
                 qt_api.QtFatalMsg: 'FATAL',
             }
+            if qt_api.QtInfoMsg is not None:
+                cls._log_type_name_map[qt_api.QtInfoMsg] = 'INFO'
         return cls._log_type_name_map[msg_type]
 
     def matches_level(self, level):
         assert level in QtLoggingPlugin.LOG_FAIL_OPTIONS
-        if level == 'DEBUG':
+        if level == 'INFO':
+            return self.log_type_name in ('INFO', 'DEBUG', 'WARNING', 'CRITICAL')
+        elif level == 'DEBUG':
             return self.log_type_name in ('DEBUG', 'WARNING', 'CRITICAL')
         elif level == 'WARNING':
             return self.log_type_name in ('WARNING', 'CRITICAL')

tests/test_logging.py

@@ -69,6 +69,7 @@ def test_qtlog_fixture(qtlog):
     """
     Test qtlog fixture.
     """
+    # qInfo is not exposed by the bindings yet (#225)
     qt_api.qDebug('this is a DEBUG message')
     qt_api.qWarning('this is a WARNING message')
     qt_api.qCritical('this is a CRITICAL message')

tox.ini

@@ -20,7 +20,7 @@ setenv=
 passenv=DISPLAY XAUTHORITY USER USERNAME
 
 [testenv:lint]
-basepython=python3.4
+basepython=python3
 usedevelop=true
 deps=
     pytest