From 20bd1cc5fdc20d0d83efd3b14201ff20f1ca8e7e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Oct 2015 06:36:38 +0200
Subject: [PATCH] Fix tests with 'DISPLAY='.

---
 tests/conftest.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/conftest.py b/tests/conftest.py
index 37e25d5bc..08e600b2a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -350,6 +350,9 @@ def pytest_configure(config):
     This is a lot nicer than having windows popping up.
     """
     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'):
         assert 'QUTE_BUILDBOT' not in os.environ
         try: