Add qtbug60673 markers to relevant tests

This commit is contained in:
Jay Kamat 2018-02-25 19:00:15 -05:00
parent cb8d62866c
commit 76bf35cbdd
No known key found for this signature in database
GPG Key ID: 5D2E399600F4F7B5
4 changed files with 8 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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"),
]

View File

@ -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