diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-03-29 19:26:28 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-03-29 23:42:14 +0200 |
| commit | 6fe5414f92acfa3ea0420b68f9765b36f6db8d5e (patch) | |
| tree | 5caf50cddcb092adb6a47b35e9953c73638db494 /tests | |
| parent | 26c1b5b7d2f28507f99ecabf27347b4506e18373 (diff) | |
| download | qutebrowser-6fe5414f92acfa3ea0420b68f9765b36f6db8d5e.tar.gz qutebrowser-6fe5414f92acfa3ea0420b68f9765b36f6db8d5e.zip | |
Revert "ipc: Remove _old_socket handling"
This reverts commit c6cf3067e158265096410afee98407826b19c472.
Seems to cause segfaults:
#0 0x00007ffff5cecbcc in void doActivate<false>(QObject*, int, void**) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Core.so.5
#1 0x00007ffff5be4e31 in QIODevice::channelReadyRead(int) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Core.so.5
#2 0x00007fffeffccb54 in QAbstractSocketPrivate::canReadNotification() () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Network.so.5
#3 0x00007fffeffdf061 in QReadNotifier::event(QEvent*) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Network.so.5
#4 0x00007ffff269e43c in QApplicationPrivate::notify_helper(QObject*, QEvent*) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Widgets.so.5
#5 0x00007ffff26a4f20 in QApplication::notify(QObject*, QEvent*) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Widgets.so.5
#6 0x00007ffff318d0d6 in sipQApplication::notify(QObject*, QEvent*) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/QtWidgets.abi3.so
#7 0x00007ffff5cb4808 in QCoreApplication::notifyInternal2(QObject*, QEvent*) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Core.so.5
#8 0x00007ffff5d10d98 in socketNotifierSourceDispatch(_GSource*, int (*)(void*), void*) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Core.so.5
#9 0x00007ffff691df9c in g_main_context_dispatch () from /usr/lib/libglib-2.0.so.0
#10 0x00007ffff6971a49 in ?? () from /usr/lib/libglib-2.0.so.0
#11 0x00007ffff691b6f1 in g_main_context_iteration () from /usr/lib/libglib-2.0.so.0
#12 0x00007ffff5d101cc in QEventDispatcherGlib::processEvents(QFlags<QEventLoop::ProcessEventsFlag>) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Core.so.5
#13 0x00007ffff5cb321a in QEventLoop::exec(QFlags<QEventLoop::ProcessEventsFlag>) () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Core.so.5
#14 0x00007ffff5cbc1d3 in QCoreApplication::exec() () from /home/florian/proj/qutebrowser/git/.tox/py39-pyqt515/lib/python3.9/site-packages/PyQt5/Qt5/lib/libQt5Core.so.5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/misc/test_ipc.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py index aaf0d4ede..c19d0bc42 100644 --- a/tests/unit/misc/test_ipc.py +++ b/tests/unit/misc/test_ipc.py @@ -600,9 +600,13 @@ def test_timeout(qtbot, caplog, qlocalsocket, ipc_server): assert caplog.messages[-1].startswith("IPC connection timed out") -def test_ipcserver_socket_none_readyread(ipc_server): +def test_ipcserver_socket_none_readyread(ipc_server, caplog): assert ipc_server._socket is None - ipc_server.on_ready_read() + assert ipc_server._old_socket is None + with caplog.at_level(logging.WARNING): + ipc_server.on_ready_read() + msg = "In on_ready_read with None socket and old_socket!" + assert msg in caplog.messages @pytest.mark.posix |