From 792a01ba6da59aa802f13f833fb77234e0d70615 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 25 Jul 2017 16:56:38 +0200 Subject: [PATCH] Try to stabilize renderer process test --- qutebrowser/mainwindow/tabbedbrowser.py | 6 +++++- tests/end2end/features/misc.feature | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py index e5ec5ac4a..dd66ad8a2 100644 --- a/qutebrowser/mainwindow/tabbedbrowser.py +++ b/qutebrowser/mainwindow/tabbedbrowser.py @@ -708,12 +708,16 @@ class TabbedBrowser(tabwidget.TabWidget): } msg = messages[status] + def show_error_page(html): + tab.set_html(html) + log.webview.debug("Showed error page for renderer termination") + if qtutils.version_check('5.9'): url_string = tab.url(requested=True).toDisplayString() error_page = jinja.render( 'error.html', title="Error loading {}".format(url_string), url=url_string, error=msg, icon='') - QTimer.singleShot(100, lambda: tab.set_html(error_page)) + QTimer.singleShot(100, lambda: show_error_page(error_page)) log.webview.error(msg) else: # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-58698 diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature index bf2b05697..2c4370576 100644 --- a/tests/end2end/features/misc.feature +++ b/tests/end2end/features/misc.feature @@ -700,6 +700,7 @@ Feature: Various utility commands. And I open data/numbers/2.txt in a new tab And I run :open chrome://kill And I wait for "Renderer process was killed" in the log + And I wait for "Showed error page for renderer termination" in the log And I open data/numbers/3.txt Then no crash should happen