summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-07-29 11:24:34 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-07-29 11:26:30 +0200
commit13267033d07bc977d9c6e368a984912d09f1b681 (patch)
tree354e9b7d979f3b59f6bb6760f8d1a9cba6f1c5cb /tests/conftest.py
parenta633bff12037c9154a7519f6396378d29c92685d (diff)
downloadqutebrowser-13267033d07bc977d9c6e368a984912d09f1b681.tar.gz
qutebrowser-13267033d07bc977d9c6e368a984912d09f1b681.zip
tests: Make some more plugins optional
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 4c6f969fb..d4d06c6bc 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -234,11 +234,6 @@ def pytest_configure(config):
@pytest.fixture(scope='session', autouse=True)
def check_display(request):
- if (not request.config.getoption('--no-xvfb') and
- 'QUTE_BUILDBOT' in os.environ and
- request.config.xvfb is not None):
- raise Exception("Xvfb is running on buildbot!")
-
if utils.is_linux and not os.environ.get('DISPLAY', ''):
raise Exception("No display and no Xvfb available!")