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

Only add BDD markers if condition matches

Browse Source 
This should make multiple markers on the same test work correctly.
This commit is contained in:
Florian Bruhin 2016-09-05 16:48:38 +02:00
parent bdc1885f6d
commit f26ce3a8ff
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/end2end/conftest.py
View File

@ -137,8 +137,6 @@ def pytest_collection_modifyitems(config, items):
qtutils.version_check('5.7.1') or
os.environ.get('QUTE_QTBUG54419_PATCHED', ''))
# Note the order here is important! Markers we add later override earlier
# markers, so we should apply the most general markers last.
markers = [
('qtwebengine_createWindow', 'Skipped because of QTBUG-54419',
pytest.mark.skipif, not qtbug_54419_fixed and config.webengine),
@ -153,7 +151,7 @@ def pytest_collection_modifyitems(config, items):
for item in items:
for name, prefix, pytest_mark, condition in markers:
marker = item.get_marker(name)
if marker:
if marker and condition:
if marker.args:
text = '{}: {}'.format(prefix, marker.args[0])
else: