Merge lp:~mikemc/ubuntuone-client/find-logging-conf into lp:ubuntuone-client

[Mike McCracken]

- Use file-relative path for logging.conf to find it in u1-client tree even when CWD is outside. (LP: #1067489)

- Use file-relative path for logging.conf to find it in u1-client tree even when CWD is outside. (LP: #1067489)

This is only a problem when running from source on windows or darwin without having previously installed the app (windows) or run the bundled .app (darwin).
If you've done that, then logging.conf is in the default place and it'll find it there without having to fall back to the incorrect relative path 'data/logging.conf' that it currently generates.

This branch also moves the test that checks this property to a different test case subclass, because the current one patches get_config_files, so we ended up testing the patched lambda with test data.

TO TEST: run the test suite (or just test_config.py)
IRL TEST: make sure you don't have logging.conf in the installed location then try running control panel from source. it'll hang forever waiting for syncdaemon which keeps dying with a message about logging_level.

[Roberto Alsina (ralsina)]

review: Approve

[Michał Karnicki (karni)]

review: Approve

[Brian Curtin (brian.curtin)]

Tests work for me. Also approved.

review: Approve

=== modified file 'tests/syncdaemon/test_config.py'
--- tests/syncdaemon/test_config.py	2012-07-19 14:16:59 +0000
+++ tests/syncdaemon/test_config.py	2012-10-17 06:56:41 +0000
@@ -435,12 +435,6 @@
         conf_1 = config._Config(conf_file)
         self.assertEquals(True, conf_1.get_show_all_notifications())
 
-    def test_load_branch_configuration(self):
-        """Check that the configuration from the branch is loaded."""
-        config_files = config.get_config_files()
-        rootdir = os.environ['ROOTDIR']
-        branch_config = os.path.join(rootdir, "data", config.CONFIG_FILE)
-        self.assertIn(branch_config, config_files)
 
     def test_get_simult_transfers(self):
         """Get simult transfers."""
@@ -516,7 +510,16 @@
         branch_config = os.path.join(fake_path, config.CONFIG_FILE)
         self.assertIn(branch_config, config_files)
 
+    def test_load_branch_configuration(self):
+        """Check that the configuration from the branch is loaded."""
+        config_files = [os.path.normpath(p) for p in config.get_config_files()]
+        rootdir = os.environ['ROOTDIR']
+        branch_config = os.path.join(rootdir, "data", config.CONFIG_FILE)
+        branch_logging_config = os.path.join(rootdir, "data", config.CONFIG_LOGS)
+        self.assertIn(branch_config, config_files)
+        self.assertIn(branch_logging_config, config_files)  
 
+        
 class ConfigglueParsersTests(BaseTwistedTestCase):
     """Tests for our custom configglue parsers."""
 

=== modified file 'ubuntuone/syncdaemon/config.py'
--- ubuntuone/syncdaemon/config.py	2012-07-19 14:16:59 +0000
+++ ubuntuone/syncdaemon/config.py	2012-10-17 06:56:41 +0000
@@ -183,7 +183,8 @@
     if os.path.exists(config_file):
         config_files.append(config_file)
 
-    config_logs = os.path.join('data', CONFIG_LOGS)
+    config_logs = os.path.join(os.path.dirname(__file__), os.path.pardir,
+                               os.path.pardir, 'data', CONFIG_LOGS)
     if os.path.exists(config_logs):
         config_files.append(config_logs)