diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-07-23 22:10:50 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2017-07-23 22:11:01 +0200 |
| commit | 1aefaaf7c74136138ed4084d503d20159ec187ec (patch) | |
| tree | 46f97d8fdb06b15c2deab6a9dc7fd0fb3eed0c8c | |
| parent | 4da89139d1529112d0a1c881e6fbccbd84d584d7 (diff) | |
| download | qutebrowser-1aefaaf7c74136138ed4084d503d20159ec187ec.tar.gz qutebrowser-1aefaaf7c74136138ed4084d503d20159ec187ec.zip | |
Fix tests for QProcess changes
| -rw-r--r-- | qutebrowser/misc/guiprocess.py | 2 | ||||
| -rw-r--r-- | tests/end2end/features/spawn.feature | 5 | ||||
| -rw-r--r-- | tests/unit/misc/test_guiprocess.py | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py index f1917b523..95bfac79e 100644 --- a/qutebrowser/misc/guiprocess.py +++ b/qutebrowser/misc/guiprocess.py @@ -154,7 +154,7 @@ class GUIProcess(QObject): log.procs.debug("Process started.") self._started = True else: - message.error("Error while spawning {}: {}.".format( + message.error("Error while spawning {}: {}".format( self._what, ERROR_STRINGS[self._proc.error()])) def exit_status(self): diff --git a/tests/end2end/features/spawn.feature b/tests/end2end/features/spawn.feature index dc0485391..e2b5fdd5b 100644 --- a/tests/end2end/features/spawn.feature +++ b/tests/end2end/features/spawn.feature @@ -60,8 +60,3 @@ Feature: :spawn Scenario: Running :spawn with userscript that expects the stdin getting closed When I run :spawn -u (testdata)/userscripts/stdinclose.py Then the message "stdin closed" should be shown - - @posix - Scenario: Running :spawn -d with userscript that expects the stdin getting closed - When I run :spawn -d -u (testdata)/userscripts/stdinclose.py - Then the message "stdin closed" should be shown diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py index 3101b7427..749031367 100644 --- a/tests/unit/misc/test_guiprocess.py +++ b/tests/unit/misc/test_guiprocess.py @@ -128,11 +128,13 @@ def test_start_detached_error(fake_proc, message_mock, caplog): """Test starting a detached process with ok=False.""" argv = ['foo', 'bar'] fake_proc._proc.startDetached.return_value = (False, 0) - fake_proc._proc.error.return_value = "Error message" + fake_proc._proc.error.return_value = QProcess.FailedToStart with caplog.at_level(logging.ERROR): fake_proc.start_detached(*argv) msg = message_mock.getmsg(usertypes.MessageLevel.error) - assert msg.text == "Error while spawning testprocess: Error message." + expected = ("Error while spawning testprocess: The process failed to " + "start.") + assert msg.text == expected def test_double_start(qtbot, proc, py_proc): |