Merge lp:~verterok/ubuntuone-client/config-read-parsed-values into lp:ubuntuone-client

[Guillermo Gonzalez]

Fix syncdaemon Config class to read parsed values, and write plain strings

[Guillermo Gonzalez (verterok)]

Fix syncdaemon Config class to read parsed values, and write plain strings

[Rick McBride (rmcbride)]

Looks good!

review: Approve

[Joshua Blount (jblount)]

review: Approve

=== modified file 'contrib/test'
--- contrib/test	2009-09-17 17:24:54 +0000
+++ contrib/test	2009-11-06 19:40:22 +0000
@@ -115,6 +115,8 @@
         # setup a custom XDG_CACHE_HOME and create the logs directory
         xdg_cache = os.path.join(os.getcwd(), "_trial_temp", "xdg_cache")
         os.environ["XDG_CACHE_HOME"] = xdg_cache
+        # setup the ROOT_DIR env var
+        os.environ['ROOT_DIR'] = os.getcwd()
         if not os.path.exists(xdg_cache):
             os.makedirs(xdg_cache)
         success = 0

=== modified file 'tests/syncdaemon/test_config.py'
--- tests/syncdaemon/test_config.py	2009-10-30 16:51:39 +0000
+++ tests/syncdaemon/test_config.py	2009-11-06 19:40:22 +0000
@@ -52,11 +52,15 @@
     def setUp(self):
         BaseTwistedTestCase.setUp(self)
         self.test_root = self.mktemp()
+        self.old_get_config_files = config.get_config_files
+        config.get_config_files = lambda: [os.path.join(os.environ['ROOT_DIR'],
+                                                   'data', 'syncdaemon.conf')]
 
     def tearDown(self):
         """cleanup everything, also the config module globals"""
+        config._user_config = None
+        config.get_config_files = self.old_get_config_files
         BaseTwistedTestCase.tearDown(self)
-        config._user_config = None
 
     def assertThrottlingSection(self, expected, current, on, read, write):
         """Assert for equality two ConfigParser and against the on, read and
@@ -79,16 +83,6 @@
         conf_file = os.path.join(self.test_root, 'test_missing_config.conf')
         # create the config object with an empty config file
         conf = config._Config(conf_file)
-        # lie a bit and load the defaults, as we can't access the data
-        # dir to get the current config, and a test shouldn't depend on
-        # external data, just fake all the defaults
-        default_conf = os.path.join(self.test_root, 'defaults.conf')
-        with open(default_conf, 'w') as fp:
-            fp.write('[bandwidth_throttling]\n')
-            fp.write('on.default = False\n')
-            fp.write('read_limit.default = -1\n')
-            fp.write('write_limit.default = -1\n')
-        conf.default = config._Config._load_defaults([default_conf])
         self.assertEquals(False, conf.get_throttling())
         self.assertEquals(None, conf.get_throttling_read_limit())
         self.assertEquals(None, conf.get_throttling_write_limit())
@@ -236,16 +230,6 @@
             fp.write('on = True\n')
             fp.write('read_limit = 1\n')
         conf = config._Config(conf_file)
-        # lie a bit and load the defaults, as we can't access the data
-        # dir to get the current config, and a test shouldn't depend on
-        # external data, just fake all the defaults
-        default_conf = os.path.join(self.test_root, 'defaults.conf')
-        with open(default_conf, 'w') as fp:
-            fp.write('[bandwidth_throttling]\n')
-            fp.write('on.default = False\n')
-            fp.write('read_limit.default = -1\n')
-            fp.write('write_limit.default = -1\n')
-        conf.default = config._Config._load_defaults([default_conf])
         self.assertEquals(True, conf.get_throttling())
         self.assertEquals(1, conf.get_throttling_read_limit())
         self.assertEquals(None, conf.get_throttling_write_limit())

=== modified file 'ubuntuone/syncdaemon/config.py'
--- ubuntuone/syncdaemon/config.py	2009-11-03 13:23:57 +0000
+++ ubuntuone/syncdaemon/config.py	2009-11-06 19:40:22 +0000
@@ -108,7 +108,6 @@
     # reverse the list as load_config_paths returns the user dir first
     config_files.reverse()
     # if we are running from a branch, get the config file from it too
-    #le = os.path.join(os.path.split(os.path.dirname(__file__))[0],
     config_file = os.path.join('data', CONFIG_FILE)
     if os.path.exists(config_file):
         config_files.append(config_file)
@@ -177,12 +176,15 @@
             os.rename(self.config_file, self.config_file+'.old')
         os.rename(self.config_file+'.new', self.config_file)
 
-    def get(self, section, option):
+    def get_parsed(self, section, option):
         """custom get that fallback to our custom defaults"""
         try:
-            return super(_Config, self).get(section, option)
+            value = super(_Config, self).get(section, option)
+            # get the parser from the default config
+            default = self.default.get(section, option)
+            return default.parser(value)
         except ConfigParser.NoOptionError, e:
-            return str(self.default.get(section, option).value)
+            return self.default.get(section, option).value
 
     # throttling section get/set
     @requires_section(THROTTLING)
@@ -199,15 +201,13 @@
 
     @requires_section(THROTTLING)
     def get_throttling(self):
-        return self.getboolean(THROTTLING, 'on')
+        return self.get_parsed(THROTTLING, 'on')
 
     @requires_section(THROTTLING)
     def get_throttling_read_limit(self):
-        value = self.getint(THROTTLING, 'read_limit')
-        return throttling_limit_parser(value)
+        return self.get_parsed(THROTTLING, 'read_limit')
 
     @requires_section(THROTTLING)
     def get_throttling_write_limit(self):
-        value = self.getint(THROTTLING, 'write_limit')
-        return throttling_limit_parser(value)
+        return self.get_parsed(THROTTLING, 'write_limit')