Add extend keyword argument to qt_log_ignore mark.

Fixes #99.

Author: The-Compiler

pytestqt/logging.py

@@ -24,7 +24,11 @@ def pytest_runtest_setup(self, item):
             return
         m = item.get_marker('qt_log_ignore')
         if m:
-            ignore_regexes = m.args
+            if m.kwargs.get('extend', False):
+                config_regexes = self.config.getini('qt_log_ignore')
+                ignore_regexes = config_regexes + list(m.args)
+            else:
+                ignore_regexes = m.args
         else:
             ignore_regexes = self.config.getini('qt_log_ignore')
         item.qt_log_capture = _QtMessageCapture(ignore_regexes)
@@ -277,4 +281,4 @@ def toterminal(self, out):
         self.fileloc.toterminal(out)
         for name, content, sep in self.sections:
             out.sep(sep, name)
-            out.line(content)
+            out.line(content)

tests/test_logging.py

@@ -340,6 +340,34 @@ def test1():
     res.assertoutcome(passed=passed, failed=int(not passed))
 
 
+@pytest.mark.parametrize('message', ['match-global', 'match-mark'])
+def test_logging_mark_with_extend(testdir, message):
+    """
+    Test qt_log_ignore mark with extend=True.
+
+    :type testdir: _pytest.pytester.TmpTestdir
+    """
+    testdir.makeini(
+        """
+        [pytest]
+        qt_log_level_fail = CRITICAL
+        qt_log_ignore = match-global
+        """
+    )
+    testdir.makepyfile(
+        """
+        from pytestqt.qt_compat import qWarning, qCritical
+        import pytest
+
+        @pytest.mark.qt_log_ignore('match-mark', extend=True)
+        def test1():
+            qCritical('{message}')
+        """.format(message=message)
+    )
+    res = testdir.inline_run()
+    res.assertoutcome(passed=1, failed=0)
+
+
 @pytest.mark.parametrize('apply_mark', [True, False])
 def test_logging_fails_ignore_mark_multiple(testdir, apply_mark):
     """