rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of extend=True for qt_log_ignore

Browse Source 
This is now the default, see #1702
This commit is contained in:
Florian Bruhin 2016-07-29 07:10:06 +02:00
parent e5e2a6a943
commit a7e9b4e5d7
6 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/browser/webkit/test_tabhistory.py
View File

@ -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 = [

3
tests/unit/browser/webkit/test_webelem.py
View File

@ -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."""

2
tests/unit/misc/test_guiprocess.py
View File

@ -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):

3
tests/unit/misc/test_sessions.py
View File

@ -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 '

3
tests/unit/utils/test_error.py
View File

@ -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'),

8
tests/unit/utils/test_qtutils.py
View File

@ -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),