diff options
author | Florian Bruhin <me@the-compiler.org> | 2021-01-14 11:40:24 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2021-01-14 11:40:24 +0100 |
commit | e66968737d433ccc4a5664491e50fad38d5655c3 (patch) | |
tree | b7c7febe8a5f0411b319117ea884f9527d5ab2c7 | |
parent | 32229f8b07a6773bdafff04ce2db582f9eefaf5e (diff) | |
download | qutebrowser-e66968737d433ccc4a5664491e50fad38d5655c3.tar.gz qutebrowser-e66968737d433ccc4a5664491e50fad38d5655c3.zip |
Revert "guiprocess: Improve output for crashing processes"
This reverts commit 32229f8b07a6773bdafff04ce2db582f9eefaf5e.
Seems to act differently on Windows.
-rw-r--r-- | qutebrowser/misc/guiprocess.py | 9 | ||||
-rw-r--r-- | tests/unit/misc/test_guiprocess.py | 12 |
2 files changed, 3 insertions, 18 deletions
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py index 00948fe13..872a594f3 100644 --- a/qutebrowser/misc/guiprocess.py +++ b/qutebrowser/misc/guiprocess.py @@ -75,12 +75,9 @@ class GUIProcess(QObject): procenv.insert(k, v) self._proc.setProcessEnvironment(procenv) - @pyqtSlot(QProcess.ProcessError) - def _on_error(self, error): + @pyqtSlot() + def _on_error(self): """Show a message if there was an error while spawning.""" - if error == QProcess.Crashed: - # Already handled via ExitStatus in _on_finished - return msg = self._proc.errorString() message.error("Error while spawning {}: {}".format(self._what, msg)) @@ -104,7 +101,7 @@ class GUIProcess(QObject): message.error(stderr.strip()) if status == QProcess.CrashExit: - exitinfo = "{} crashed.".format(self._what.capitalize()) + exitinfo = "{} crashed!".format(self._what.capitalize()) message.error(exitinfo) elif status == QProcess.NormalExit and code == 0: exitinfo = "{} exited successfully.".format( diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py index e86eda5c4..4ed19f64e 100644 --- a/tests/unit/misc/test_guiprocess.py +++ b/tests/unit/misc/test_guiprocess.py @@ -237,18 +237,6 @@ def test_exit_unsuccessful(qtbot, proc, message_mock, py_proc, caplog): assert msg.text == expected -def test_exit_crash(qtbot, proc, message_mock, py_proc, caplog): - with caplog.at_level(logging.ERROR): - with qtbot.waitSignal(proc.finished, timeout=10000): - proc.start(*py_proc(""" - import os, signal - os.kill(os.getpid(), signal.SIGSEGV) - """)) - - msg = message_mock.getmsg(usertypes.MessageLevel.error) - assert msg.text == "Testprocess crashed." - - @pytest.mark.parametrize('stream', ['stdout', 'stderr']) def test_exit_unsuccessful_output(qtbot, proc, caplog, py_proc, stream): """When a process fails, its output should be logged.""" |