From 845fb87bf0db6da5ca82492dad78105fd6a89e16 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 21 Feb 2020 18:19:03 +0100 Subject: [PATCH] Fix reaming issues with HTTP error logging Note Qt 5.7 logs "Load error 500" without the "HTTP ERROR". --- tests/end2end/features/javascript.feature | 2 +- tests/end2end/features/test_prompts_bdd.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature index 785b25438..a4c3d1338 100644 --- a/tests/end2end/features/javascript.feature +++ b/tests/end2end/features/javascript.feature @@ -187,7 +187,7 @@ Feature: Javascript stuff When I set content.javascript.enabled to false And I open 500 without waiting Then "Showing error page for* 500" should be logged - And "Load error: HTTP ERROR 500" should be logged + And "Load error: *500" should be logged @flaky Scenario: Using JS after window.open diff --git a/tests/end2end/features/test_prompts_bdd.py b/tests/end2end/features/test_prompts_bdd.py index 61797435a..e7602c5b4 100644 --- a/tests/end2end/features/test_prompts_bdd.py +++ b/tests/end2end/features/test_prompts_bdd.py @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with qutebrowser. If not, see . -import time - import pytest_bdd as bdd bdd.scenarios('prompts.feature') @@ -57,8 +55,10 @@ def ssl_error_page(request, quteproc): msg = quteproc.wait_for(message="Load error: *") msg.expected = True - expected_messages = ['Load error: ERR_INSECURE_RESPONSE', # Qt <= 5.10 - 'Load error: ERR_CERT_AUTHORITY_INVALID'] # Qt 5.11 + expected_messages = [ + 'Load error: ERR_INSECURE_RESPONSE', # Qt <= 5.10 + 'Load error: ERR_CERT_AUTHORITY_INVALID', # Qt 5.11 + ] assert msg.message in expected_messages else: if not request.config.webengine: