diff --git a/tests/unit/browser/webkit/test_tabhistory.py b/tests/unit/browser/webkit/test_tabhistory.py index f6cce419f..b7261f456 100644 --- a/tests/unit/browser/webkit/test_tabhistory.py +++ b/tests/unit/browser/webkit/test_tabhistory.py @@ -29,8 +29,7 @@ from qutebrowser.browser.webkit.tabhistory import TabHistoryItem as Item from qutebrowser.utils import qtutils -pytestmark = pytest.mark.qt_log_ignore('QIODevice::read.*: device not open', - extend=True) +pytestmark = pytest.mark.qt_log_ignore('QIODevice::read.*: device not open') ITEMS = [ diff --git a/tests/unit/browser/webkit/test_webelem.py b/tests/unit/browser/webkit/test_webelem.py index a5c10f702..dec1fe4ce 100644 --- a/tests/unit/browser/webkit/test_webelem.py +++ b/tests/unit/browser/webkit/test_webelem.py @@ -895,8 +895,7 @@ class TestJavascriptEscape: """Test javascript escaping with a real QWebPage.""" self._test_escape(text, qtbot, webframe) - @pytest.mark.qt_log_ignore('^OpenType support missing for script', - extend=True) + @pytest.mark.qt_log_ignore('^OpenType support missing for script') @hypothesis.given(hypothesis.strategies.text()) def test_real_escape_hypothesis(self, webframe, qtbot, text): """Test javascript escaping with a real QWebPage and hypothesis.""" diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py index 255458812..ce4e3fa7e 100644 --- a/tests/unit/misc/test_guiprocess.py +++ b/tests/unit/misc/test_guiprocess.py @@ -105,7 +105,7 @@ def test_start_env(monkeypatch, qtbot, py_proc): assert 'QUTEBROWSER_TEST_2' in ret_env -@pytest.mark.qt_log_ignore('QIODevice::read.*: WriteOnly device', extend=True) +@pytest.mark.qt_log_ignore('QIODevice::read.*: WriteOnly device') def test_start_mode(proc, qtbot, py_proc): """Test simply starting a process with mode parameter.""" with qtbot.waitSignals([proc.started, proc.finished], timeout=10000): diff --git a/tests/unit/misc/test_sessions.py b/tests/unit/misc/test_sessions.py index a0432f65a..6d229ac4f 100644 --- a/tests/unit/misc/test_sessions.py +++ b/tests/unit/misc/test_sessions.py @@ -35,8 +35,7 @@ from qutebrowser.browser.webkit.tabhistory import TabHistoryItem as Item from qutebrowser.commands import cmdexc -pytestmark = pytest.mark.qt_log_ignore('QIODevice::read.*: device not open', - extend=True) +pytestmark = pytest.mark.qt_log_ignore('QIODevice::read.*: device not open') webengine_refactoring_xfail = pytest.mark.xfail( True, reason='Broke during QtWebEngine refactoring, will be fixed after ' diff --git a/tests/unit/utils/test_error.py b/tests/unit/utils/test_error.py index b29416173..c8440819b 100644 --- a/tests/unit/utils/test_error.py +++ b/tests/unit/utils/test_error.py @@ -71,8 +71,7 @@ def test_no_err_windows(caplog, exc, name, exc_text, fake_args): @pytest.mark.qt_log_ignore(r'^QXcbConnection: XCB error: 8 \(BadMatch\), ' r'sequence: \d+, resource id: \d+, major code: 42 ' r'\(SetInputFocus\), minor code: 0$', - r'^QIODevice::write: device not open', - extend=True) + r'^QIODevice::write: device not open') @pytest.mark.parametrize('pre_text, post_text, expected', [ ('', '', 'exception'), ('foo', '', 'foo: exception'), diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py index a3d895842..083e615ea 100644 --- a/tests/unit/utils/test_qtutils.py +++ b/tests/unit/utils/test_qtutils.py @@ -339,8 +339,7 @@ class TestSerializeStream: assert src_obj == dest_obj - @pytest.mark.qt_log_ignore('^QIODevice::write.*: ReadOnly device', - extend=True) + @pytest.mark.qt_log_ignore('^QIODevice::write.*: ReadOnly device') def test_serialize_readonly_stream(self): """Test serialize_stream with a read-only stream.""" data = QByteArray() @@ -350,8 +349,7 @@ class TestSerializeStream: assert str(excinfo.value) == ("The data stream cannot write to the " "underlying device.") - @pytest.mark.qt_log_ignore('QIODevice::read.*: WriteOnly device', - extend=True) + @pytest.mark.qt_log_ignore('QIODevice::read.*: WriteOnly device') def test_deserialize_writeonly_stream(self): """Test deserialize_stream with a write-only stream.""" data = QByteArray() @@ -724,7 +722,7 @@ class TestPyQIODevice: with pytest.raises(io.UnsupportedOperation): pyqiodev.fileno() - @pytest.mark.qt_log_ignore('^QBuffer::seek: Invalid pos:', extend=True) + @pytest.mark.qt_log_ignore('^QBuffer::seek: Invalid pos:') @pytest.mark.parametrize('offset, whence, pos, data, raising', [ (0, io.SEEK_SET, 0, b'1234567890', False), (42, io.SEEK_SET, 0, b'1234567890', True),