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

tests: Get rid of flaky_once mark

Browse Source
This commit is contained in:
Florian Bruhin 2016-11-10 22:40:16 +01:00
parent 40c5c75a6c
commit 2ded5ef6dd
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pytest.ini
View File

@ -14,7 +14,6 @@ markers =
end2end: End to end tests which run qutebrowser as subprocess
xfail_norun: xfail the test with out running it
ci: Tests which should only run on CI.
flaky_once: Try to rerun this test once if it fails
qtwebengine_todo: Features still missing with QtWebEngine
qtwebengine_skip: Tests not applicable with QtWebEngine
qtwebkit_skip: Tests not applicable with QtWebKit

2
tests/conftest.py
View File

@ -121,8 +121,6 @@ def pytest_collection_modifyitems(config, items):
_apply_platform_markers(item)
if item.get_marker('xfail_norun'):
item.add_marker(pytest.mark.xfail(run=False))
if item.get_marker('flaky_once'):
item.add_marker(pytest.mark.flaky())
if item.get_marker('js_prompt'):
if config.webengine:
js_prompt_pyqt_version = 0x050700

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

@ -34,7 +34,7 @@ Feature: Page history
Then the history file should contain:
http://localhost:(port)/data/%C3%A4%C3%B6%C3%BC.html Chäschüechli
@flaky_once @qtwebengine_todo: Error page message is not implemented
@flaky @qtwebengine_todo: Error page message is not implemented
Scenario: History with an error
When I run :open file:///does/not/exist
And I wait for "Error while loading file:///does/not/exist: Error opening /does/not/exist: *" in the log