diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-09-28 22:19:33 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2015-09-30 07:08:30 +0200 |
| commit | 4a5f243ff0032c80b3b77969867a408aaec0c0c1 (patch) | |
| tree | 668eab32a73542eb232179db3fba426bb7fbb314 | |
| parent | 7a33dff986cd4851cab4a422aa2e6cfa3313836f (diff) | |
| download | qutebrowser-4a5f243ff0032c80b3b77969867a408aaec0c0c1.tar.gz qutebrowser-4a5f243ff0032c80b3b77969867a408aaec0c0c1.zip | |
Allow unittests-nodisp to run w/o DISPLAY on CI.
| -rw-r--r-- | tests/conftest.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index b234fc0e3..43d5e0e25 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -61,7 +61,8 @@ def pytest_collection_modifyitems(items): if 'qapp' in getattr(item, 'fixturenames', ()): item.add_marker('gui') if sys.platform == 'linux' and not os.environ.get('DISPLAY', ''): - if 'CI' in os.environ: + if ('CI' in os.environ and + not os.environ.get('QUTE_NO_DISPLAY_OK', '')): raise Exception("No display available on CI!") skip_marker = pytest.mark.skipif( True, reason="No DISPLAY available") |