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

tests: Wait until clipboard actually changed.

Browse Source 
Hopefully fixes #1124.
This commit is contained in:
Florian Bruhin 2015-11-23 16:29:37 +01:00
parent 17b5ccde0e
commit 39f29e2531
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/integration/features/test_yankpaste.py
View File

@ -31,13 +31,16 @@ pytestmark = pytest.mark.qt_log_ignore(
'^QXcbClipboard: SelectionRequest too old', extend=True) '^QXcbClipboard: SelectionRequest too old', extend=True)
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def skip_with_broken_clipboard(qapp): def skip_with_broken_clipboard(qtbot, qapp):
"""The clipboard seems to be broken on some platforms (OS X Yosemite?). """The clipboard seems to be broken on some platforms (OS X Yosemite?).
This skips the tests if this is the case. This skips the tests if this is the case.
""" """
clipboard = qapp.clipboard() clipboard = qapp.clipboard()
clipboard.setText("Does this work?")
with qtbot.waitSignal(clipboard.changed):
clipboard.setText("Does this work?")
if clipboard.text() != "Does this work?": if clipboard.text() != "Does this work?":
pytest.skip("Clipboard seems to be broken on this platform.") pytest.skip("Clipboard seems to be broken on this platform.")
@ -60,10 +63,13 @@ def selection_supported(qapp):
@bdd.when(bdd.parsers.re(r'I put "(?P<content>.*)" into the ' @bdd.when(bdd.parsers.re(r'I put "(?P<content>.*)" into the '
r'(?P<what>primary selection|clipboard)')) r'(?P<what>primary selection|clipboard)'))
def fill_clipboard(qapp, httpbin, what, content): def fill_clipboard(qtbot, qapp, httpbin, what, content):
mode = _get_mode(qapp, what) mode = _get_mode(qapp, what)
content = content.replace('(port)', str(httpbin.port)) content = content.replace('(port)', str(httpbin.port))
qapp.clipboard().setText(content, mode)
clipboard = qapp.clipboard()
with qtbot.waitSignal(clipboard.changed):
clipboard.setText(content, mode)
@bdd.then(bdd.parsers.re(r'the (?P<what>primary selection|clipboard) should ' @bdd.then(bdd.parsers.re(r'the (?P<what>primary selection|clipboard) should '