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

Fix tests with 'DISPLAY='.

Browse Source
This commit is contained in:
Florian Bruhin 2015-10-08 06:36:38 +02:00
parent ffab11c871
commit 20bd1cc5fd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/conftest.py
View File

@ -350,6 +350,9 @@ def pytest_configure(config):
This is a lot nicer than having windows popping up. This is a lot nicer than having windows popping up.
""" """
config.xvfb_display = None config.xvfb_display = None
if os.environ.get('DISPLAY', None) == '':
# xvfbwrapper doesn't handle DISPLAY="" correctly
del os.environ['DISPLAY']
if sys.platform.startswith('linux') and not config.getoption('--no-xvfb'): if sys.platform.startswith('linux') and not config.getoption('--no-xvfb'):
assert 'QUTE_BUILDBOT' not in os.environ assert 'QUTE_BUILDBOT' not in os.environ
try: try: