Add qt_log_ignore mark

Author: nicoddemus

pytestqt/_tests/test_logging.py

@@ -232,3 +232,34 @@ def test4():
         '*3 failed, 1 passed*',
     ]
     res.stdout.fnmatch_lines(lines)
+
+
+@pytest.mark.parametrize('mark_regex', ['WM_DESTROY.*sent', 'no-match', None])
+def test_logging_fails_ignore_mark(testdir, mark_regex):
+    """
+    Test qt_log_ignore mark overrides config option.
+
+    :type testdir: _pytest.pytester.TmpTestdir
+    """
+    testdir.makeini(
+        """
+        [pytest]
+        qt_log_level_fail = CRITICAL
+        """
+    )
+    if mark_regex:
+        mark = '@pytest.mark.qt_log_ignore("{0}")'.format(mark_regex)
+    else:
+        mark = ''
+    testdir.makepyfile(
+        """
+        from pytestqt.qt_compat import qWarning, qCritical
+        import pytest
+        {mark}
+        def test1():
+            qCritical('WM_DESTROY was sent')
+        """.format(mark=mark)
+    )
+    res = testdir.inline_run()
+    passed = 1 if mark_regex == 'WM_DESTROY.*sent' else 0
+    res.assertoutcome(passed=passed, failed=int(not passed))

pytestqt/plugin.py

@@ -593,6 +593,9 @@ def pytest_configure(config):
     config.addinivalue_line(
         'markers',
         'qt_log_level_fail: overrides qt_log_level_fail ini option.')
+    config.addinivalue_line(
+        'markers',
+        'qt_log_ignore: overrides qt_log_ignore ini option.')
 
     if config.getoption('qt_log'):
         config.pluginmanager.register(QtLoggingPlugin(config), '_qt_logging')
@@ -623,8 +626,12 @@ def __init__(self, config):
         self.config = config
 
     def pytest_runtest_setup(self, item):
-        item.qt_log_capture = _QtMessageCapture(
-            item.config.getini('qt_log_ignore'))
+        m = item.get_marker('qt_log_ignore')
+        if m:
+            ignore_regexes = m.args
+        else:
+            ignore_regexes = self.config.getini('qt_log_ignore')
+        item.qt_log_capture = _QtMessageCapture(ignore_regexes)
         previous_handler = qInstallMsgHandler(item.qt_log_capture._handle)
         item.qt_previous_handler = previous_handler