From 53e7d13c2d35c083bf820fbfbcd8271f8001f52e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 10:42:55 +0100
Subject: [PATCH] Skip failing scrolling tests on Qt 5.10 on Travis

See #3572
---
 pytest.ini                            | 1 +
 tests/conftest.py                     | 4 ++++
 tests/end2end/features/scroll.feature | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 56cd808ad..89571aebc 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -26,6 +26,7 @@ markers =
     this: Used to mark tests during development
     no_invalid_lines: Don't fail on unparseable lines in end2end tests
     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
     fake_os: Fake utils.is_* to a fake operating system
     unicode_locale: Tests which need an unicode locale to work
 qt_log_level_fail = WARNING
diff --git a/tests/conftest.py b/tests/conftest.py
index 7d6a0da09..d9d5fc034 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -64,6 +64,10 @@ def _apply_platform_markers(config, item):
         ('no_ci', 'CI' in os.environ, "Skipped on CI."),
         ('issue2478', utils.is_windows and config.webengine,
          "Broken with QtWebEngine on Windows"),
+        ('issue3572',
+         qtutils.version_check('5.10', compiled=False, exact=True) and
+         config.webengine and 'TRAVIS' in os.environ,
+         "Broken with QtWebEngine with Qt 5.10 on Travis"),
         ('unicode_locale', sys.getfilesystemencoding() == 'ascii',
          "Skipped because of ASCII locale"),
     ]
diff --git a/tests/end2end/features/scroll.feature b/tests/end2end/features/scroll.feature
index e77b57dc8..f73eb352b 100644
--- a/tests/end2end/features/scroll.feature
+++ b/tests/end2end/features/scroll.feature
@@ -233,6 +233,7 @@ 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
@@ -315,6 +316,7 @@ 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