Fix remaining Qt 5.8 QtWebEngine test failures

This commit is contained in:
Florian Bruhin 2017-02-04 13:28:38 +01:00
parent 987cb236e8
commit 148b34a50b
5 changed files with 28 additions and 18 deletions

View File

@ -1138,6 +1138,9 @@ Show an info message in the statusbar.
==== positional arguments
* +'text'+: The text to show.
==== count
How many times to show the message
[[message-warning]]
=== message-warning
Syntax: +:message-warning 'text'+

View File

@ -115,13 +115,16 @@ def message_error(text):
@cmdutils.register(hide=True)
def message_info(text):
@cmdutils.argument('count', count=True)
def message_info(text, count=1):
"""Show an info message in the statusbar.
Args:
text: The text to show.
count: How many times to show the message
"""
message.info(text)
for _ in range(count):
message.info(text)
@cmdutils.register(hide=True)

View File

@ -917,6 +917,7 @@ Feature: Tab management
And I run :buffer "99/1"
Then the error "There's no window with id 99!" should be shown
@qtwebengine_flaky
Scenario: :buffer with matching window index
Given I have a fresh instance
When I open data/title.html

View File

@ -99,29 +99,24 @@ Feature: Miscellaneous utility commands exposed to the user.
## :repeat-command
Scenario: :repeat-command
When I run :scroll down
When I run :message-info test1
And I run :repeat-command
And I run :scroll up
Then the page should be scrolled vertically
Then the message "test1" should be shown
And the message "test1" should be shown
Scenario: :repeat-command with count
When I run :scroll down with count 3
And I wait until the scroll position changed
And I run :scroll up
And I wait until the scroll position changed
When I run :message-info test2
And I run :repeat-command with count 2
And I wait until the scroll position changed to 0/0
Then the page should not be scrolled
Then the message "test2" should be shown
And the message "test2" should be shown
And the message "test2" should be shown
Scenario: :repeat-command with not-normal command inbetween
When I run :scroll down with count 3
And I wait until the scroll position changed
And I run :scroll up
And I wait until the scroll position changed
When I run :message-info test3
And I run :prompt-accept
And I run :repeat-command with count 2
And I wait until the scroll position changed to 0/0
Then the page should not be scrolled
And I run :repeat-command
Then the message "test3" should be shown
And the message "test3" should be shown
And the error "prompt-accept: This command is only allowed in prompt/yesno mode, not normal." should be shown
Scenario: :repeat-command with mode-switching command

View File

@ -63,6 +63,14 @@ def is_ignored_lowlevel_message(message):
return True
elif 'CERT_PKIXVerifyCert for localhost failed' in message:
return True
elif 'Invalid node channel message' in message:
# Started appearing in sessions.feature with Qt 5.8...
return True
elif ("_dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= "
"GL(dl_tls_generation)' failed!" in message):
# Started appearing with Qt 5.8...
# http://patchwork.sourceware.org/patch/10255/
return True
return False