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

bdd: Fix handling of @qtweb{kit_engine}_* tags

Browse Source
This commit is contained in:
Florian Bruhin 2016-09-05 15:53:19 +02:00
parent 21fe8f43f9
commit 6151a5faa7
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/end2end/conftest.py
View File

@ -136,21 +136,23 @@ def pytest_collection_modifyitems(config, items):
qtutils.version_check('5.7.1') or qtutils.version_check('5.7.1') or
os.environ.get('QUTE_QTBUG54419_PATCHED', '')) os.environ.get('QUTE_QTBUG54419_PATCHED', ''))
markers = { # Note the order here is important! Markers we add later override earlier
'qtwebengine_todo': ('QtWebEngine TODO', pytest.mark.xfail, # markers, so we should apply the most general markers last.
config.webengine), markers = [
'qtwebengine_skip': ('Skipped with QtWebEngine', pytest.mark.skipif, ('qtwebengine_createWindow', 'Skipped because of QTBUG-54419',
config.webengine), pytest.mark.skipif,
'qtwebkit_skip': ('Skipped with QtWebKit', pytest.mark.skipif, not qtbug_54419_fixed and
not config.webengine), config.webengine),
'qtwebengine_createWindow': ('Skipped because of QTBUG-54419', ('qtwebengine_todo', 'QtWebEngine TODO', pytest.mark.xfail,
pytest.mark.skipif, config.webengine),
not qtbug_54419_fixed and ('qtwebengine_skip', 'Skipped with QtWebEngine', pytest.mark.skipif,
config.webengine) config.webengine),
} ('qtwebkit_skip', 'Skipped with QtWebKit', pytest.mark.skipif,
not config.webengine),
]
for item in items: for item in items:
for name, (prefix, pytest_mark, condition) in markers.items(): for name, prefix, pytest_mark, condition in markers:
marker = item.get_marker(name) marker = item.get_marker(name)
if marker: if marker:
if marker.args: if marker.args: