Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Condition DBUS connectivity test on a single envvar

Browse Source 
That way it will still run in the future if X goes away
This commit is contained in:
Kovid Goyal 2016-07-03 16:04:37 +05:30 committed by David
parent 95a42eb768
commit 83ba85ef1b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/test_build.py
View File

@ -32,14 +32,12 @@ class BuildTest(unittest.TestCase):
@unittest.skipUnless(islinux, 'DBUS only used on linux') @unittest.skipUnless(islinux, 'DBUS only used on linux')
def test_dbus(self): def test_dbus(self):
import dbus import dbus
bus = None if 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
if 'DISPLAY' in os.environ:
bus = dbus.SystemBus() bus = dbus.SystemBus()
self.assertTrue(bus.list_names(), 'Failed to list names on the system bus') self.assertTrue(bus.list_names(), 'Failed to list names on the system bus')
if 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
bus = dbus.SessionBus() bus = dbus.SessionBus()
self.assertTrue(bus.list_names(), 'Failed to list names on the session bus') self.assertTrue(bus.list_names(), 'Failed to list names on the session bus')
del bus del bus
def test_regex(self): def test_regex(self):
import regex import regex