Merge lp:~dobey/ubuntuone-dev-tools/dbus-priv into lp:ubuntuone-dev-tools

[dobey]

Check that DBUS_SESSION_BUS_ADDRESS is setup correctly for tests
Fail the tests if the address doesn't point to a private instance
Pass the address directly into the BusConnection()

This makes the DBus test cases fail if the session bus address is wrong, and should always connect to the right daemon, since it passes in the address directly.

However, I would like to add a check for number of connections to the daemon, so that if we connect, and there are a bunch of existing connections, the test will fail, because it's probably connecting to the wrong thing, and/or the previous run tests aren't getting cleaned up properly and their connections closed. Unfortunately, it seems there is a larger problem where the previous run tests aren't getting their connections closed properly, and so stay connected to the bus and instantiated in memory.

[Natalia Bidart (nataliabidart)]

Thanks!

review: Approve

[Eric Casteleijn (thisfred)]

review: Approve

=== modified file 'ubuntuone/devtools/testcase.py'
--- ubuntuone/devtools/testcase.py	2011-05-24 21:54:50 +0000
+++ ubuntuone/devtools/testcase.py	2011-05-31 17:46:00 +0000
@@ -129,6 +129,10 @@
 # pylint: enable=C0103
 
 
+class InvalidSessionBus(Exception):
+    """Error when we are connected to the wrong session bus in tests."""
+
+
 class FakeDBusInterface(object):
     """A fake DBusInterface..."""
 
@@ -217,8 +221,19 @@
         # dbus modules will be imported by the decorator
         # pylint: disable=E0602
         yield super(DBusTestCase, self).setUp()
+
+        # We need to ensure DBUS_SESSION_BUS_ADDRESS is private here
+        from urllib import unquote
+        bus_address = os.environ.get('DBUS_SESSION_BUS_ADDRESS', None)
+        if os.path.dirname(unquote(bus_address.split(',')[0].split('=')[1])) \
+                != os.path.dirname(os.getcwd()):
+            raise InvalidSessionBus('DBUS_SESSION_BUS_ADDRES is wrong.')
+
+        # Set up the main loop and bus connection
         self.loop = DBusGMainLoop(set_as_default=True)
-        self.bus = dbus.bus.BusConnection(mainloop=self.loop)
+        self.bus = dbus.bus.BusConnection(address_or_type=bus_address,
+                                          mainloop=self.loop)
+
         # monkeypatch busName.__del__ to avoid errors on gc
         # we take care of releasing the name in shutdown
         service.BusName.__del__ = lambda _: None