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

tests: Get rid of QSignalSpy where we can.

Browse Source
This commit is contained in:
Florian Bruhin 2015-12-17 07:09:45 +01:00
parent e9a0dffe3b
commit c1951a8f15
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/unit/misc/test_ipc.py
View File

@ -444,14 +444,10 @@ class TestHandleConnection:
ipc_server._server = FakeServer(socket) ipc_server._server = FakeServer(socket)
spy = QSignalSpy(ipc_server.got_args) with qtbot.waitSignal(ipc_server.got_args, raising=True) as blocker:
with qtbot.waitSignal(ipc_server.got_args, raising=True):
ipc_server.handle_connection() ipc_server.handle_connection()
assert len(spy) == 1 assert blocker.args == [['foo'], 'tab', '']
assert spy[0][0] == ['foo']
assert spy[0][1] == 'tab'
all_msgs = [r.message for r in caplog.records] all_msgs = [r.message for r in caplog.records]
assert "We can read a line immediately." in all_msgs assert "We can read a line immediately." in all_msgs
@ -527,12 +523,10 @@ def test_multiline(qtbot, ipc_server, connected_socket):
raising=True): raising=True):
connected_socket.write(data.encode('utf-8')) connected_socket.write(data.encode('utf-8'))
assert len(spy) == 2
assert not error_spy assert not error_spy
assert spy[0][0] == ['one'] assert len(spy) == 2
assert spy[0][1] == 'tab' assert spy[0] == [['one'], 'tab', '']
assert spy[1][0] == ['two'] assert spy[1] == [['two'], '', '']
assert spy[1][1] == ''
class TestSendToRunningInstance: class TestSendToRunningInstance:
@ -547,11 +541,11 @@ class TestSendToRunningInstance:
@pytest.mark.linux(reason="Causes random trouble on Windows and OS X") @pytest.mark.linux(reason="Causes random trouble on Windows and OS X")
def test_normal(self, qtbot, tmpdir, ipc_server, mocker, has_cwd): def test_normal(self, qtbot, tmpdir, ipc_server, mocker, has_cwd):
ipc_server.listen() ipc_server.listen()
spy = QSignalSpy(ipc_server.got_args)
raw_spy = QSignalSpy(ipc_server.got_raw) raw_spy = QSignalSpy(ipc_server.got_raw)
error_spy = QSignalSpy(ipc_server.got_invalid_data) error_spy = QSignalSpy(ipc_server.got_invalid_data)
with qtbot.waitSignal(ipc_server.got_args, raising=True, timeout=5000): with qtbot.waitSignal(ipc_server.got_args, raising=True,
timeout=5000) as blocker:
with tmpdir.as_cwd(): with tmpdir.as_cwd():
if not has_cwd: if not has_cwd:
m = mocker.patch('qutebrowser.misc.ipc.os') m = mocker.patch('qutebrowser.misc.ipc.os')
@ -563,8 +557,7 @@ class TestSendToRunningInstance:
assert not error_spy assert not error_spy
expected_cwd = str(tmpdir) if has_cwd else '' expected_cwd = str(tmpdir) if has_cwd else ''
assert len(spy) == 1 assert blocker.args == [['foo'], '', expected_cwd]
assert spy[0] == [['foo'], '', expected_cwd]
assert len(raw_spy) == 1 assert len(raw_spy) == 1
assert len(raw_spy[0]) == 1 assert len(raw_spy[0]) == 1