diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-12-09 00:38:10 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-12-09 00:38:10 +0100 |
| commit | 02c3f02edc2152b2d41c5c004f9f047cadc3a244 (patch) | |
| tree | a4062c8911ea29ae6eed641e8ebe62eb411197fe | |
| parent | 784c55bb858e6cf3c65147a7a6d2df44564f35fe (diff) | |
| download | qutebrowser-02c3f02edc2152b2d41c5c004f9f047cadc3a244.tar.gz qutebrowser-02c3f02edc2152b2d41c5c004f9f047cadc3a244.zip | |
Re-enable renderer process tests on Qt 5.14
QTBUG-80085 has been fixed.
This mostly reverts d8745237d9d8b31e5df6119ac05c3847eca0c06c.
See #5013
| -rw-r--r-- | pytest.ini | 1 | ||||
| -rw-r--r-- | tests/conftest.py | 6 | ||||
| -rw-r--r-- | tests/end2end/features/misc.feature | 6 |
3 files changed, 3 insertions, 10 deletions
diff --git a/pytest.ini b/pytest.ini index 3d80fc0e2..d2088b2ab 100644 --- a/pytest.ini +++ b/pytest.ini @@ -27,7 +27,6 @@ markers = this: Used to mark tests during development no_invalid_lines: Don't fail on unparseable lines in end2end tests 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_xfail: Tests which would fail on WebKit version 602.1 diff --git a/tests/conftest.py b/tests/conftest.py index d7e314c65..f2a78bbe6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -108,12 +108,6 @@ def _apply_platform_markers(config, item): config.webengine, "Broken on webengine due to " "https://bugreports.qt.io/browse/QTBUG-60673"), - ('qtbug80085', - pytest.mark.xfail, - qtutils.version_check('5.14', compiled=False) and - config.webengine, - "Broken on webengine due to " - "https://bugreports.qt.io/browse/QTBUG-80085"), ('qtwebkit6021_xfail', pytest.mark.xfail, version.qWebKitVersion and # type: ignore diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature index 83208688f..e6b7f9fa4 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 @qtbug80085 + @qtwebkit_skip @no_invalid_lines @posix @qt>=5.9 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 @qtbug80085 + @qtwebkit_skip @no_invalid_lines @qt>=5.9 @flaky 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 @qtbug80085 + @qtwebkit_skip @no_invalid_lines @flaky Scenario: Navigating to URL after renderer process is gone When I run :tab-only And I open data/numbers/1.txt |