From 2ded5ef6dd72d3f91240c4e59fbcba7a98030bcf Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 10 Nov 2016 22:40:16 +0100 Subject: [PATCH] tests: Get rid of flaky_once mark --- pytest.ini | 1 - tests/conftest.py | 2 -- tests/end2end/features/history.feature | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pytest.ini b/pytest.ini index 3ab397c10..109e30fde 100644 --- a/pytest.ini +++ b/pytest.ini @@ -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 diff --git a/tests/conftest.py b/tests/conftest.py index 3b3fc3248..7fa94ffc3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -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 diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature index 165bdd792..529cced46 100644 --- a/tests/end2end/features/history.feature +++ b/tests/end2end/features/history.feature @@ -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