rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skip failing scrolling tests on Qt 5.10 on Travis

Browse Source 
See #3572
This commit is contained in:
Florian Bruhin 2018-02-08 10:42:55 +01:00
parent c520130389
commit 53e7d13c2d
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pytest.ini
View File

@ -26,6 +26,7 @@ markers =
this: Used to mark tests during development this: Used to mark tests during development
no_invalid_lines: Don't fail on unparseable lines in end2end tests 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 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 fake_os: Fake utils.is_* to a fake operating system
unicode_locale: Tests which need an unicode locale to work unicode_locale: Tests which need an unicode locale to work
qt_log_level_fail = WARNING qt_log_level_fail = WARNING

4
tests/conftest.py
View File

@ -64,6 +64,10 @@ def _apply_platform_markers(config, item):
('no_ci', 'CI' in os.environ, "Skipped on CI."), ('no_ci', 'CI' in os.environ, "Skipped on CI."),
('issue2478', utils.is_windows and config.webengine, ('issue2478', utils.is_windows and config.webengine,
"Broken with QtWebEngine on Windows"), "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', ('unicode_locale', sys.getfilesystemencoding() == 'ascii',
"Skipped because of ASCII locale"), "Skipped because of ASCII locale"),
] ]

2
tests/end2end/features/scroll.feature
View File

@ -233,6 +233,7 @@ Feature: Scrolling
Then the page should be scrolled vertically Then the page should be scrolled vertically
# https://github.com/qutebrowser/qutebrowser/issues/1821 # https://github.com/qutebrowser/qutebrowser/issues/1821
@issue3572
Scenario: :scroll-to-perc without doctype Scenario: :scroll-to-perc without doctype
When I open data/scroll/no_doctype.html When I open data/scroll/no_doctype.html
And I run :scroll-to-perc 100 And I run :scroll-to-perc 100
@ -315,6 +316,7 @@ Feature: Scrolling
## issues ## issues
@issue3572
Scenario: Relative scroll position with a position:absolute page Scenario: Relative scroll position with a position:absolute page
When I open data/scroll/position_absolute.html When I open data/scroll/position_absolute.html
And I run :scroll-to-perc 100 And I run :scroll-to-perc 100