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

tests: Use extend=True for qt_log_ignore marks.

Browse Source 
This should finally resolve the warning flakiness on OS X.
This commit is contained in:
Florian Bruhin 2015-10-16 06:24:29 +02:00
parent 71e6c38065
commit 24dc166e1f
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/browser/test_webelem.py
View File

@ -644,7 +644,7 @@ class TestJavascriptEscape:
"""Test javascript escaping with a real QWebPage."""
self._test_escape(text, qtbot, webframe)
@pytest.mark.qt_log_ignore('^load glyph failed')
@pytest.mark.qt_log_ignore('^load glyph failed', extend=True)
@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

@ -109,7 +109,7 @@ def test_start_env(monkeypatch, qtbot, py_proc):
@pytest.mark.not_frozen
@pytest.mark.qt_log_ignore('QIODevice::read.*: WriteOnly device')
@pytest.mark.qt_log_ignore('QIODevice::read.*: WriteOnly device', extend=True)
def test_start_mode(proc, qtbot, py_proc):
"""Test simply starting a process with mode parameter."""
with qtbot.waitSignals([proc.started, proc.finished], raising=True,

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

@ -74,7 +74,8 @@ def test_no_err_windows(caplog, exc, name, exc_text):
# See https://github.com/The-Compiler/qutebrowser/issues/984
@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'\(SetInputFocus\), minor code: 0$',
extend=True)
@pytest.mark.parametrize('pre_text, post_text, expected', [
('', '', 'exception'),
('foo', '', 'foo: exception'),

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

@ -338,7 +338,8 @@ class TestSerializeStream:
assert src_obj == dest_obj
@pytest.mark.qt_log_ignore('^QIODevice::write.*: ReadOnly device')
@pytest.mark.qt_log_ignore('^QIODevice::write.*: ReadOnly device',
extend=True)
def test_serialize_readonly_stream(self):
"""Test serialize_stream with a read-only stream."""
data = QByteArray()
@ -348,7 +349,8 @@ class TestSerializeStream:
assert str(excinfo.value) == ("The data stream cannot write to the "
"underlying device.")
@pytest.mark.qt_log_ignore('QIODevice::read.*: WriteOnly device')
@pytest.mark.qt_log_ignore('QIODevice::read.*: WriteOnly device',
extend=True)
def test_deserialize_writeonly_stream(self):
"""Test deserialize_stream with a write-only stream."""
data = QByteArray()
@ -707,7 +709,7 @@ class TestPyQIODevice:
with pytest.raises(io.UnsupportedOperation):
pyqiodev.fileno()
@pytest.mark.qt_log_ignore('^QBuffer::seek: Invalid pos:')
@pytest.mark.qt_log_ignore('^QBuffer::seek: Invalid pos:', extend=True)
@pytest.mark.parametrize('offset, whence, pos, data, raising', [
(0, io.SEEK_SET, 0, b'1234567890', False),
(42, io.SEEK_SET, 0, b'1234567890', True),