From 83ba85ef1b110045954e105f02fb587416ac4b39 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 3 Jul 2016 16:04:37 +0530 Subject: [PATCH] Condition DBUS connectivity test on a single envvar That way it will still run in the future if X goes away --- src/calibre/test_build.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py index 143f24389e..245d695864 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py @@ -32,14 +32,12 @@ class BuildTest(unittest.TestCase): @unittest.skipUnless(islinux, 'DBUS only used on linux') def test_dbus(self): import dbus - bus = None - if 'DISPLAY' in os.environ: + if 'DBUS_SESSION_BUS_ADDRESS' in os.environ: bus = dbus.SystemBus() self.assertTrue(bus.list_names(), 'Failed to list names on the system bus') - if 'DBUS_SESSION_BUS_ADDRESS' in os.environ: bus = dbus.SessionBus() self.assertTrue(bus.list_names(), 'Failed to list names on the session bus') - del bus + del bus def test_regex(self): import regex