Merge lp:~dobey/ubuntuone-dev-tools/fix-src-config into lp:ubuntuone-dev-tools

[dobey]

Fix the missing comma and use abspath to get the full path
Add a test to ensure the config file is loaded from the correct place in tests

[Manuel de la Peña (mandel)]

+1

review: Approve

[lp:~dobey/ubuntuone-dev-tools/fix-src-config]

15. By dobey on 2010-12-22

Use os.path.pardir instead of ..

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'ubuntuone/devtools/services/dbus.py'
--- ubuntuone/devtools/services/dbus.py	2010-11-03 21:04:06 +0000
+++ ubuntuone/devtools/services/dbus.py	2010-12-22 19:04:50 +0000
@@ -45,8 +45,10 @@
     def _find_config_file(self):
         """Find the first appropriate dbus-session.conf to use."""
         # In case we're running from within the source tree
-        path = os.path.join(os.path.dirname(__file__), "..", "..", ".."
-                            "data", "dbus-session.conf")
+        path = os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                            os.path.pardir, os.path.pardir,
+                                            os.path.pardir,
+                                            "data", "dbus-session.conf"))
         if os.path.exists(path):
             return path
 
 
=== modified file 'ubuntuone/devtools/services/tests/test_dbus.py'
--- ubuntuone/devtools/services/tests/test_dbus.py	2010-11-03 21:04:06 +0000
+++ ubuntuone/devtools/services/tests/test_dbus.py	2010-12-22 19:04:50 +0000
@@ -2,6 +2,7 @@
 
 import os
 from ubuntuone.devtools.testcase import DBusTestCase
+from ubuntuone.devtools.services.dbus import DBusRunner
 
 
 class TestWithDBus(DBusTestCase):
@@ -13,3 +14,13 @@
         self.assertTrue(
             bus_address.startswith('unix:abstract=%s' % os.path.dirname(
                     os.getcwd())))
+
+    def test_config_file_path(self):
+        """Test that we loaded the config file from the local tree."""
+        expected = os.path.abspath(os.path.join(
+                os.path.dirname(__file__),
+                os.path.pardir, os.path.pardir, os.path.pardir, os.path.pardir,
+                'data', 'dbus-session.conf'))
+        runner = DBusRunner()
+        # pylint: disable=W0212
+        self.assertEqual(expected, runner._find_config_file())