diff options
author | Florian Bruhin <me@the-compiler.org> | 2019-11-19 16:11:13 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2019-11-19 16:11:13 +0100 |
commit | d8745237d9d8b31e5df6119ac05c3847eca0c06c (patch) | |
tree | c7505644fb562cb6e35d0f92b73fde15478e8019 | |
parent | 8499ab04ffb9e5763b480b2063984eeff6ffbe0c (diff) | |
download | qutebrowser-d8745237d9d8b31e5df6119ac05c3847eca0c06c.tar.gz qutebrowser-d8745237d9d8b31e5df6119ac05c3847eca0c06c.zip |
Skip renderProcessTerminated tests on Qt 5.14 for now
See #5013
This should allow us to start running Qt 5.14 tests on Travis.
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | pytest.ini | 1 | ||||
-rw-r--r-- | tests/conftest.py | 5 | ||||
-rw-r--r-- | tests/end2end/features/misc.feature | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 0c796561b..e560f9f43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ os: linux matrix: fast_finish: true - allow_failures: - - env: DOCKER=archlinux-webengine-unstable QUTE_BDD_WEBENGINE=true - services: docker + # allow_failures: + # - env: DOCKER=archlinux-webengine-unstable QUTE_BDD_WEBENGINE=true + # services: docker include: ### Archlinux QtWebKit - env: DOCKER=archlinux-webkit diff --git a/pytest.ini b/pytest.ini index 9db5502b3..d41d86e8e 100644 --- a/pytest.ini +++ b/pytest.ini @@ -29,6 +29,7 @@ markers = issue2478: Tests which are broken on Windows with QtWebEngine, https://github.com/qutebrowser/qutebrowser/issues/2478 issue3572: Tests which are broken with QtWebEngine and Qt 5.10, https://github.com/qutebrowser/qutebrowser/issues/3572 qtbug60673: Tests which are broken if the conversion from orange selection to real selection is flaky + qtbug80085: Tests which are broken on Qt 5.14 due to a missing renderProcessTerminated signal fake_os: Fake utils.is_* to a fake operating system unicode_locale: Tests which need an unicode locale to work qtwebkit6021_skip: Tests which would fail on WebKit version 602.1 diff --git a/tests/conftest.py b/tests/conftest.py index 2bb7a4cda..f23adc966 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -84,6 +84,11 @@ def _apply_platform_markers(config, item): config.webengine, "Broken on webengine due to " "https://bugreports.qt.io/browse/QTBUG-60673"), + ('qtbug80085', + qtutils.version_check('5.14', compiled=False) and + config.webengine, + "Broken on webengine due to " + "https://bugreports.qt.io/browse/QTBUG-80085"), ('unicode_locale', sys.getfilesystemencoding() == 'ascii', "Skipped because of ASCII locale"), ('qtwebkit6021_skip', diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature index e6b7f9fa4..83208688f 100644 --- a/tests/end2end/features/misc.feature +++ b/tests/end2end/features/misc.feature @@ -514,20 +514,20 @@ Feature: Various utility commands. Then the error "Renderer process was killed" should be shown # Skipped on Windows as "... has stopped working" hangs. - @qtwebkit_skip @no_invalid_lines @posix @qt>=5.9 + @qtwebkit_skip @no_invalid_lines @posix @qt>=5.9 @qtbug80085 Scenario: Renderer crash (5.9) When I run :open -t chrome://crash Then "Renderer process crashed" should be logged And "* 'Error loading chrome://crash/'" should be logged - @qtwebkit_skip @no_invalid_lines @qt>=5.9 @flaky + @qtwebkit_skip @no_invalid_lines @qt>=5.9 @flaky @qtbug80085 Scenario: Renderer kill (5.9) When I run :open -t chrome://kill Then "Renderer process was killed" should be logged And "* 'Error loading chrome://kill/'" should be logged # https://github.com/qutebrowser/qutebrowser/issues/2290 - @qtwebkit_skip @no_invalid_lines @flaky + @qtwebkit_skip @no_invalid_lines @flaky @qtbug80085 Scenario: Navigating to URL after renderer process is gone When I run :tab-only And I open data/numbers/1.txt |