Fix reaming issues with HTTP error logging

Note Qt 5.7 logs "Load error 500" without the "HTTP ERROR".
This commit is contained in:
Florian Bruhin 2020-02-21 18:19:03 +01:00
parent 87553d8e78
commit 845fb87bf0
2 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -17,8 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
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: