summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2018-02-05 16:16:22 +0100
committerBastien Nocera <hadess@hadess.net>2018-02-05 16:16:22 +0100
commit8db612400503d346529f59ac597d1fddb7c75fe1 (patch)
tree400eb80447365897c9beeafced47c127fbe82a19 /tests
parentea6725f3633d881c68c7c114b43934d905081570 (diff)
downloadgnome-settings-daemon-8db612400503d346529f59ac597d1fddb7c75fe1.tar.gz
tests: Check for Xvfb binary and remove mention of dummy driver
Diffstat (limited to 'tests')
-rw-r--r--tests/gsdtestcase.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/gsdtestcase.py b/tests/gsdtestcase.py
index c5ba2d08..cf1c9f7e 100644
--- a/tests/gsdtestcase.py
+++ b/tests/gsdtestcase.py
@@ -58,9 +58,6 @@ class GSDTestCase(dbusmock.DBusTestCase):
os.environ['LC_MESSAGES'] = 'C'
klass.workdir = tempfile.mkdtemp(prefix='gsd-power-test')
- # start X.org server with dummy driver; this is needed until Xvfb
- # supports XRandR:
- # http://lists.x.org/archives/xorg-devel/2013-January/035114.html
klass.start_xorg()
# tell dconf and friends to use our config/runtime directories
@@ -191,6 +188,10 @@ class GSDTestCase(dbusmock.DBusTestCase):
'''start Xvfb server'''
xorg = GLib.find_program_in_path ('Xvfb')
+ if not xorg:
+ sys.stderr.write('Cannot start X.org, Xvfb binary not found\n')
+ sys.exit(1)
+
display_num = 99
if os.path.isfile('/tmp/.X%d-lock' % display_num):