diff --git a/pytest.ini b/pytest.ini index 0d5b86a4c..1147551bb 100644 --- a/pytest.ini +++ b/pytest.ini @@ -19,6 +19,7 @@ markers = qtwebengine_skip: Tests not applicable with QtWebEngine qtwebkit_skip: Tests not applicable with QtWebKit qtwebengine_createWindow: Tests using createWindow with QtWebEngine (QTBUG-54419) + qtwebengine_flaky: Tests which are flaky (and currently skipped) with QtWebEngine qt_log_level_fail = WARNING qt_log_ignore = ^SpellCheck: .* diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py index 09ca18f28..aecb9845b 100644 --- a/tests/end2end/conftest.py +++ b/tests/end2end/conftest.py @@ -146,6 +146,8 @@ def pytest_collection_modifyitems(config, items): config.webengine), ('qtwebkit_skip', 'Skipped with QtWebKit', pytest.mark.skipif, not config.webengine), + ('qtwebengine_flaky', 'Flaky with QtWebEngine', pytest.mark.skipif, + config.webengine), ] for item in items: diff --git a/tests/end2end/features/backforward.feature b/tests/end2end/features/backforward.feature index d7e83da49..fdbd6257a 100644 --- a/tests/end2end/features/backforward.feature +++ b/tests/end2end/features/backforward.feature @@ -102,7 +102,7 @@ Feature: Going back and forward. Then the error "At beginning of history." should be shown And the message "Still alive!" should be shown - @qtwebengine_skip: flaky for some reason? + @qtwebengine_flaky Scenario: Going back in a new window Given I clean up open tabs When I open data/backforward/1.txt diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature index da0c1b603..b2b28d8dd 100644 --- a/tests/end2end/features/hints.feature +++ b/tests/end2end/features/hints.feature @@ -9,12 +9,13 @@ Feature: Using hints And I hint with args "links normal" and follow xyz Then the error "No hint xyz!" should be shown - @qtwebengine_skip: Flaky because scrolling happens async + @qtwebengine_flaky Scenario: Following a link after scrolling down When I open data/scroll/simple.html And I run :hint links normal And I wait for "hints: *" in the log And I run :scroll-page 0 1 + And I wait until the scroll position changed And I run :follow-hint a Then the error "Element position is out of view!" should be shown @@ -227,7 +228,7 @@ Feature: Using hints Then data/numbers/7.txt should be loaded # https://github.com/The-Compiler/qutebrowser/issues/576 - @qtwebengine_skip: Flaky for some reason + @qtwebengine_flaky Scenario: Keeping hint filter in rapid mode When I open data/hints/number.html And I set hints -> mode to number diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature index a1ee2ae48..0b24982e8 100644 --- a/tests/end2end/features/misc.feature +++ b/tests/end2end/features/misc.feature @@ -190,7 +190,8 @@ Feature: Various utility commands. # :view-source - @qtwebengine_skip: Flaky due to :view-source being async + # Flaky due to :view-source being async? + @qtwebengine_flaky Scenario: :view-source Given I open data/hello.txt When I run :tab-only @@ -205,7 +206,8 @@ Feature: Various utility commands. history: [] And the page should contain the html "/* Literal.Number.Integer */" - @qtwebengine_skip: Flaky due to :view-source being async + # Flaky due to :view-source being async? + @qtwebengine_flaky Scenario: :view-source on source page. When I open data/hello.txt And I run :view-source @@ -439,7 +441,7 @@ Feature: Various utility commands. And the page should contain the plaintext "the-warning-message" And the page should contain the plaintext "the-info-message" - @qtwebengine_skip: Flaky for some reason? + @qtwebengine_flaky Scenario: Showing messages of an invalid level When I run :messages cataclysmic Then the error "Invalid log level cataclysmic!" should be shown @@ -626,9 +628,10 @@ Feature: Various utility commands. - data/click_element.html - data/hello.txt (active) - @qtwebengine_skip: Flaky because scrolling happens async + @qtwebengine_flaky Scenario: Clicking an element which is out of view When I open data/scroll/simple.html And I run :scroll-page 0 1 + And I wait until the scroll position changed And I run :click-element id link Then the error "Element position is out of view!" should be shown diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature index 7c047085f..cd8f3b9b5 100644 --- a/tests/end2end/features/tabs.feature +++ b/tests/end2end/features/tabs.feature @@ -647,8 +647,7 @@ Feature: Tab management - url: http://localhost:*/data/numbers/2.txt - url: http://localhost:*/data/numbers/3.txt - # FIXME:qtwebengine - @qtwebengine_skip: Broken/flaky for some reason? + @qtwebengine_flaky Scenario: Undo with auto-created last tab When I open data/hello.txt And I run :tab-only @@ -660,8 +659,7 @@ Feature: Tab management Then the following tabs should be open: - data/hello.txt (active) - # FIXME:qtwebengine - @qtwebengine_skip: Broken/flaky for some reason? + @qtwebengine_flaky Scenario: Undo with auto-created last tab, with history When I open data/hello.txt And I open data/hello2.txt