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

tests: Add a not_xvfb marker.

Browse Source
This commit is contained in:
Florian Bruhin 2015-11-24 16:17:07 +01:00
parent 75178b0cdc
commit 542d13b70d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pytest.ini
View File

@ -8,6 +8,7 @@ markers =
osx: Tests which only can run on OS X. osx: Tests which only can run on OS X.
not_osx: Tests which can not run on OS X. not_osx: Tests which can not run on OS X.
not_frozen: Tests which can't be run if sys.frozen is True. not_frozen: Tests which can't be run if sys.frozen is True.
not_xvfb: Tests which can't be run with Xvfb.
frozen: Tests which can only be run if sys.frozen is True. frozen: Tests which can only be run if sys.frozen is True.
integration: Tests which test a bigger portion of code, run without coverage. integration: Tests which test a bigger portion of code, run without coverage.
flakes-ignore = flakes-ignore =

2
tests/conftest.py
View File

@ -54,6 +54,8 @@ def _apply_platform_markers(item):
"Can't be run when frozen"), "Can't be run when frozen"),
('frozen', not getattr(sys, 'frozen', False), ('frozen', not getattr(sys, 'frozen', False),
"Can only run when frozen"), "Can only run when frozen"),
('not_xvfb', item.config.xvfb_display is not None,
"Can't be run with Xvfb."),
] ]
for searched_marker, condition, default_reason in markers: for searched_marker, condition, default_reason in markers: