diff options
author | Florian Bruhin <me@the-compiler.org> | 2021-01-14 11:45:04 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2021-01-14 12:44:41 +0100 |
commit | 2d035ef8cd18262abc1e109eb138881ea8c16427 (patch) | |
tree | 8fbc05e0d99b6a551d17950335592fcd1833d964 | |
parent | d5c6523919edadcb4e7dfce3609da2ad8b4e0f4e (diff) | |
download | qutebrowser-2d035ef8cd18262abc1e109eb138881ea8c16427.tar.gz qutebrowser-2d035ef8cd18262abc1e109eb138881ea8c16427.zip |
guiprocess: Adjust message handling for Windows
-rw-r--r-- | qutebrowser/misc/guiprocess.py | 4 | ||||
-rw-r--r-- | tests/unit/misc/test_guiprocess.py | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py index 00948fe13..4b0727793 100644 --- a/qutebrowser/misc/guiprocess.py +++ b/qutebrowser/misc/guiprocess.py @@ -25,7 +25,7 @@ import shlex from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QObject, QProcess, QProcessEnvironment) -from qutebrowser.utils import message, log +from qutebrowser.utils import message, log, utils from qutebrowser.browser import qutescheme @@ -78,7 +78,7 @@ class GUIProcess(QObject): @pyqtSlot(QProcess.ProcessError) def _on_error(self, error): """Show a message if there was an error while spawning.""" - if error == QProcess.Crashed: + if error == QProcess.Crashed and not utils.is_windows: # Already handled via ExitStatus in _on_finished return msg = self._proc.errorString() diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py index e86eda5c4..9b2e1e7b3 100644 --- a/tests/unit/misc/test_guiprocess.py +++ b/tests/unit/misc/test_guiprocess.py @@ -25,7 +25,7 @@ import pytest from PyQt5.QtCore import QProcess from qutebrowser.misc import guiprocess -from qutebrowser.utils import usertypes +from qutebrowser.utils import usertypes, utils from qutebrowser.browser import qutescheme @@ -245,8 +245,12 @@ def test_exit_crash(qtbot, proc, message_mock, py_proc, caplog): os.kill(os.getpid(), signal.SIGSEGV) """)) + expected = ( + "Testprocess exited with status 11, see :messages for details." + if utils.is_windows else "Testprocess crashed." + ) msg = message_mock.getmsg(usertypes.MessageLevel.error) - assert msg.text == "Testprocess crashed." + assert msg.text == expected @pytest.mark.parametrize('stream', ['stdout', 'stderr']) |