From 76bf35cbdd9fa2cea125a4d763da7bbe6ee5a2bd Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sun, 25 Feb 2018 19:00:15 -0500
Subject: [PATCH] Add qtbug60673 markers to relevant tests

---
 pytest.ini                                    | 1 +
 qutebrowser/browser/webengine/webenginetab.py | 1 -
 tests/conftest.py                             | 5 +++++
 tests/end2end/features/caret.feature          | 4 ++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 89571aebc..d6226c03b 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -27,6 +27,7 @@ markers =
     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
+    qtbug60673: Tests which are broken if the conversion from orange selection to real selection  is flakey
     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/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 2c87acdc3..072d5276a 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -218,7 +218,6 @@ class WebEngineCaret(browsertab.AbstractCaret):
         if mode != usertypes.KeyMode.caret:
             return
 
-        # Clear search, replace with blue selection
         if self._tab.search.search_displayed:
             # We are currently in search mode.
             # convert the search to a blue selection so we can operate on it
diff --git a/tests/conftest.py b/tests/conftest.py
index d9d5fc034..ba9e4ab9c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -68,6 +68,11 @@ def _apply_platform_markers(config, item):
          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"),
+        ('qtbug60673',
+         qtutils.version_check('5.8') and
+         not qtutils.version_check('5.10') and
+         config.webengine,
+         "Broken on webengine due to qtbug60673"),
         ('unicode_locale', sys.getfilesystemencoding() == 'ascii',
          "Skipped because of ASCII locale"),
     ]
diff --git a/tests/end2end/features/caret.feature b/tests/end2end/features/caret.feature
index e9cf54c8d..803016539 100644
--- a/tests/end2end/features/caret.feature
+++ b/tests/end2end/features/caret.feature
@@ -324,7 +324,7 @@ Feature: Caret mode
     # Search + caret mode
 
     # https://bugreports.qt.io/browse/QTBUG-60673
-    @qt!=5.8.0 @qt!=5.9.0 @qt!=5.9.1 @qt!=5.9.2 @qt!=5.9.3 @qt!=5.9.4
+    @qtbug60673
     Scenario: yanking a searched line
         When I run :leave-mode
         And I run :search fiv
@@ -334,7 +334,7 @@ Feature: Caret mode
         And I run :yank selection
         Then the clipboard should contain "five six"
 
-    @qt!=5.8.0 @qt!=5.9.0 @qt!=5.9.1 @qt!=5.9.2 @qt!=5.9.3 @qt!=5.9.4
+    @qtbug60673
     Scenario: yanking a searched line with multiple matches
         When I run :leave-mode
         And I run :search w