Merge lp:~veebers/autopilot/get_session_gloop_fix into lp:autopilot

[Christopher Lee]

Fixes expceptions thrown due to dbuss sessions created before gobject main loop

Fixes expceptions thrown due to dbuss sessions created before gobject main loop

[lp:~veebers/autopilot/get_session_gloop_fix]

187. By Christopher Lee on 2013-05-02

Oops missed one. Also whitespace/order fix

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/autopilot-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/60

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/61/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'autopilot/dbus_handler.py'
--- autopilot/dbus_handler.py	2013-04-30 16:30:25 +0000
+++ autopilot/dbus_handler.py	2013-05-02 16:31:28 +0000
@@ -22,23 +22,47 @@
 
 from __future__ import absolute_import
 
+from dbus._dbus import BusConnection
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
 
 _glib_loop_set = False
 
-def get_session_bus():
-    """This function returns a session bus that has had the DBus GLib main loop
-    initialised.
-
-    """
+# DBus has an annoying bug where we need to initialise it with the gobject main
+# loop *before* it's initialised anywhere else. This module exists so we can
+# initialise the dbus module once, and once only.
+
+
+def _ensure_glib_loop_set():
     global _glib_loop_set
     if not _glib_loop_set:
-        #
-        # DBus has an annoying bug where we need to initialise it with the gobject main
-        # loop *before* it's initialised anywhere else. This module exists so we can
-        # initialise the dbus module once, and once only.
         DBusGMainLoop(set_as_default=True)
         _glib_loop_set = True
-    # create a global session bus object:
+
+
+def get_session_bus():
+    """This function returns a session bus that has had the DBus GLib main loop
+    initialised.
+
+    """
+    _ensure_glib_loop_set()
     return dbus.SessionBus()
+
+
+def get_system_bus():
+    """This function returns a system bus that has had the DBus GLib main loop
+    initialised.
+
+    """
+    _ensure_glib_loop_set()
+    return dbus.SystemBus()
+
+
+def get_custom_bus(bus_address):
+    """This function returns a custom bus that has had the DBus GLib main loop
+    initialised.
+
+    """
+    _ensure_glib_loop_set()
+    return BusConnection(bus_address)
+

=== modified file 'autopilot/introspection/backends.py'
--- autopilot/introspection/backends.py	2013-04-30 16:21:30 +0000
+++ autopilot/introspection/backends.py	2013-05-02 16:31:28 +0000
@@ -20,9 +20,12 @@
 "Backend interface for autopilot."
 from __future__ import absolute_import
 
-from dbus._dbus import BusConnection
 import dbus
-
+from autopilot.dbus_handler import (
+    get_session_bus,
+    get_system_bus,
+    get_custom_bus,
+    )
 from autopilot.introspection.constants import (
     AP_INTROSPECTION_IFACE,
     DBUS_INTROSPECTION_IFACE,
@@ -37,12 +40,12 @@
     @staticmethod
     def SessionBus(connection, object_path):
         """Construct a DBusAddress that backs on to the session bus."""
-        return DBusAddress(dbus.SessionBus(), connection, object_path)
+        return DBusAddress(get_session_bus(), connection, object_path)
 
     @staticmethod
     def SystemBus(connection, object_path):
         """Construct a DBusAddress that backs on to the system bus."""
-        return DBusAddress(dbus.SystemBus(), connection, object_path)
+        return DBusAddress(get_system_bus(), connection, object_path)
 
     @staticmethod
     def CustomBus(bus_address, connection, object_path):
@@ -52,7 +55,7 @@
             connect to.
 
         """
-        return DBusAddress(BusConnection(bus_address), connection, object_path)
+        return DBusAddress(get_custom_bus(bus_address), connection, object_path)
 
     def __init__(self, bus, connection, object_path):
         """Construct a DBusAddress instance.
@@ -108,9 +111,9 @@
         return repr(self)
 
     def __repr__(self):
-        if self._bus_type == dbus.Bus.TYPE_SESSION:
+        if self._bus._bus_type == dbus.Bus.TYPE_SESSION:
             name = "session"
-        elif self._bus_type == dbus.Bus.TYPE_SYSTEM:
+        elif self._bus._bus_type == dbus.Bus.TYPE_SYSTEM:
             name = "system"
         else:
             name = "custom"