summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2019-11-21 14:33:04 +0100
committerFlorian Bruhin <me@the-compiler.org>2019-11-21 14:33:04 +0100
commit8cbf6305e972b43b828e47f13c160e9754dae01f (patch)
treed426f0baffa8fe2d70f2f4aff5c3b10899bbae4b
parent539638d3f1f9709482060476527cf45e9164876a (diff)
downloadqutebrowser-8cbf6305e972b43b828e47f13c160e9754dae01f.tar.gz
qutebrowser-8cbf6305e972b43b828e47f13c160e9754dae01f.zip
tests: Remove issue3572 marker
See #3572
-rw-r--r--pytest.ini1
-rw-r--r--tests/conftest.py6
-rw-r--r--tests/end2end/features/scroll.feature3
3 files changed, 0 insertions, 10 deletions
diff --git a/pytest.ini b/pytest.ini
index 2e12a78a8..3d80fc0e2 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -26,7 +26,6 @@ markers =
js_prompt: Tests needing to display a javascript prompt
this: Used to mark tests during development
no_invalid_lines: Don't fail on unparseable lines in end2end tests
- 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
diff --git a/tests/conftest.py b/tests/conftest.py
index 9ef2ff96c..46b8967e6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -101,12 +101,6 @@ def _apply_platform_markers(config, item):
sys.getfilesystemencoding() == 'ascii',
"Skipped because of ASCII locale"),
- ('issue3572',
- pytest.mark.xfail,
- (qtutils.version_check('5.10', compiled=False, exact=True) or
- qtutils.version_check('5.10.1', compiled=False, exact=True)) and
- config.webengine and 'TRAVIS' in os.environ,
- "Broken with QtWebEngine with Qt 5.10 on Travis"),
('qtbug60673',
pytest.mark.xfail,
qtutils.version_check('5.8') and
diff --git a/tests/end2end/features/scroll.feature b/tests/end2end/features/scroll.feature
index a77998e2d..27d724435 100644
--- a/tests/end2end/features/scroll.feature
+++ b/tests/end2end/features/scroll.feature
@@ -237,7 +237,6 @@ Feature: Scrolling
Then the page should be scrolled vertically
# https://github.com/qutebrowser/qutebrowser/issues/1821
- @issue3572
Scenario: :scroll-to-perc without doctype
When I open data/scroll/no_doctype.html
And I run :scroll-to-perc 100
@@ -291,7 +290,6 @@ Feature: Scrolling
And I run :scroll-page --bottom-navigate next 0 1
Then data/hello2.txt should be loaded
- @issue3572
Scenario: :scroll-page with --bottom-navigate and zoom
When I run :zoom 200
And I wait 0.5s
@@ -323,7 +321,6 @@ Feature: Scrolling
## issues
- @issue3572
Scenario: Relative scroll position with a position:absolute page
When I open data/scroll/position_absolute.html
And I run :scroll-to-perc 100