summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2014-09-02 15:57:09 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2014-09-02 15:57:09 +0200
commite5bd3e80f3239d4d52b52b91e73007f12f60d312 (patch)
tree52a631c7ae300dbb38d32eaa531794f2f275a8cc
parent0b50cef90c277ce550a5b14ec2fffd8178f93694 (diff)
downloadupower-e5bd3e80f3239d4d52b52b91e73007f12f60d312.tar.gz
Linux integration tests: Fix crash if there is no session D-BUS
This can happen in CI environments without a desktop session.
-rwxr-xr-xsrc/linux/integration-test5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/linux/integration-test b/src/linux/integration-test
index ba7e702..f99fe1f 100755
--- a/src/linux/integration-test
+++ b/src/linux/integration-test
@@ -81,7 +81,10 @@ class Tests(unittest.TestCase):
# set up a fake system D-BUS
cls.test_bus = Gio.TestDBus.new(Gio.TestDBusFlags.NONE)
cls.test_bus.up()
- del os.environ['DBUS_SESSION_BUS_ADDRESS']
+ try:
+ del os.environ['DBUS_SESSION_BUS_ADDRESS']
+ except KeyError:
+ pass
os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = cls.test_bus.get_bus_address()
cls.dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)