summaryrefslogtreecommitdiff
path: root/tests/end2end/conftest.py
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2016-09-05 15:32:12 +0200
committerFlorian Bruhin <git@the-compiler.org>2016-09-05 15:32:12 +0200
commit21fe8f43f966d2bd02b41030dc3b7bf866b98909 (patch)
tree12270bcfa01c78e03fcf183be93ce6adf8f819bd /tests/end2end/conftest.py
parentf2c4cedf619f89045172ce2be57ea1c8416ecead (diff)
downloadqutebrowser-21fe8f43f966d2bd02b41030dc3b7bf866b98909.tar.gz
qutebrowser-21fe8f43f966d2bd02b41030dc3b7bf866b98909.zip
tests: Fix handling of QUTE_BDD_WEBENGINE
The tryfirst decorator somehow messed up handling of other pytest marks... Also we need to do this in the root conftest for it to work properly.
Diffstat (limited to 'tests/end2end/conftest.py')
-rw-r--r--tests/end2end/conftest.py12
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index c9f18e8c3..a3c8d903c 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -129,7 +129,6 @@ if not getattr(sys, 'frozen', False):
return None
-@pytest.hookimpl(trylast=True)
def pytest_collection_modifyitems(config, items):
"""Apply @qtwebengine_* markers; skip unittests with QUTE_BDD_WEBENGINE."""
vercheck = qtutils.version_check
@@ -160,14 +159,3 @@ def pytest_collection_modifyitems(config, items):
text = prefix
item.add_marker(pytest_mark(condition, reason=text,
**marker.kwargs))
-
- if os.environ.get('QUTE_BDD_WEBENGINE', ''):
- remaining = []
- deselected = []
- for item in items:
- if not item.get_marker('end2end'):
- deselected.append(item)
- else:
- remaining.append(item)
- config.hook.pytest_deselected(items=deselected)
- items[:] = remaining