Merge lp:~verterok/ubuntuone-client/fix-throttling-parser into lp:ubuntuone-client

[Guillermo Gonzalez]

fix throttling_limit_parser and add tests for all all configglue parsers

[Guillermo Gonzalez (verterok)]

fix throttling_limit_parser and add tests for all all configglue parsers

[Vincenzo Di Somma (vds)]

review: Approve

[John O'Brien (jdobrien)]

Glad you wrote tests for this! This will enfornce a quality product!

review: Approve

[John Lenton (chipaca)]

The attempt to merge lp:~verterok/ubuntuone-client/fix-throttling-parser into lp:ubuntuone-client failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.64
checking for automake >= 1.10...
(B testing automake-1.11... found 1.11
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.22
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --prefix=/usr ...
(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump......

[lp:~verterok/ubuntuone-client/fix-throttling-parser]

276. By Guillermo Gonzalez on 2009-11-03

remove unused import

=== modified file 'tests/syncdaemon/test_config.py'
--- tests/syncdaemon/test_config.py	2009-10-12 16:00:16 +0000
+++ tests/syncdaemon/test_config.py	2009-11-03 13:27:14 +0000
@@ -17,8 +17,14 @@
 """tests for the syncdaemon config module """
 from __future__ import with_statement
 
+import contextlib
+import logging
 import os
 from ConfigParser import ConfigParser
+from xdg.BaseDirectory import (
+    xdg_data_home,
+    xdg_cache_home,
+)
 
 from ubuntuone.syncdaemon import (
     config,
@@ -28,6 +34,18 @@
 )
 
 
[e-mail]
+def environ(env_var, new_value):
+    """context manager to replace/add an environ value"""
+    old_value = os.environ.get(env_var, None)
+    os.environ[env_var] = new_value
+    yield
+    if old_value is None:
+        os.environ.pop(env_var)
+    else:
+        os.environ[env_var] = old_value
+
+
 class TestConfigBasic(BaseTwistedTestCase):
     """Basic _Config object tests"""
 
@@ -232,3 +250,62 @@
         self.assertEquals(1, conf.get_throttling_read_limit())
         self.assertEquals(None, conf.get_throttling_write_limit())
 
+
+class ConfigglueParsersTests(BaseTwistedTestCase):
+    """Tests for our custom configglue parsers"""
+
+    def test_throttling_limit_parser(self):
+        """Test throttling_limit_parser"""
+        good_value = '20480'
+        unset_value = '-1'
+        bad_value = 'hola'
+        invalid_value = None
+        parser = config.throttling_limit_parser
+        self.assertEquals(20480, parser(good_value))
+        self.assertEquals(None, parser(unset_value))
+        self.assertRaises(ValueError, parser, bad_value)
+        self.assertRaises(TypeError, parser, invalid_value)
+
+    def test_log_level_parser(self):
+        """Test log_level_parser"""
+        good_value = 'INFO'
+        bad_value = 'hola'
+        invalid_value = None
+        parser = config.log_level_parser
+        self.assertEquals(logging.INFO, parser(good_value))
+        self.assertEquals(logging.DEBUG, parser(bad_value))
+        self.assertRaises(TypeError, parser, invalid_value)
+
+    def test_home_dir_parser(self):
+        """Test home_dir_parser"""
+        good_value = '~/hola'
+        bad_value = 'hola'
+        invalid_value = None
+        parser = config.home_dir_parser
+        with environ('HOME', '/home/fake'):
+            self.assertEquals('/home/fake/hola', parser(good_value))
+        self.assertEquals('hola', parser(bad_value))
+        self.assertRaises(AttributeError, parser, invalid_value)
+
+    def test_xdg_cache_dir_parser(self):
+        """Test xdg_cache_dir_parser"""
+        good_value = 'hola'
+        bad_value = '/hola'
+        invalid_value = None
+        parser = config.xdg_cache_dir_parser
+        self.assertEquals(os.path.join(xdg_cache_home, 'hola'),
+                          parser(good_value))
+        self.assertEquals('/hola', parser(bad_value))
+        self.assertRaises(AttributeError, parser, invalid_value)
+
+    def test_xdg_data_dir_parser(self):
+        """Test xdg_data_dir_parser"""
+        good_value = 'hola'
+        bad_value = '/hola'
+        invalid_value = None
+        parser = config.xdg_data_dir_parser
+        self.assertEquals(os.path.join(xdg_data_home, 'hola'),
+                          parser(good_value))
+        self.assertEquals('/hola', parser(bad_value))
+        self.assertRaises(AttributeError, parser, invalid_value)
+

=== modified file 'ubuntuone/syncdaemon/config.py'
--- ubuntuone/syncdaemon/config.py	2009-10-12 16:00:16 +0000
+++ ubuntuone/syncdaemon/config.py	2009-11-03 13:27:14 +0000
@@ -31,7 +31,6 @@
     xdg_data_home,
     xdg_cache_home,
 )
-from ubuntuone.syncdaemon import logger
 
 
 CONFIG_FILE = 'syncdaemon.conf'
@@ -73,16 +72,17 @@
     level = getattr(logging, value, None)
     if level is None:
         # if level don't exists in our custom levels, fallback to DEBUG
-        level = logger.levels.get(value, 'DEBUG')
+        level = getattr(logging, 'DEBUG')
     return level
 
 
 def throttling_limit_parser(value):
     """parser for throttling limit values, if value < 0 returns None"""
+    value = int(value)
     if value < 0:
         return None
     else:
-        return int(value)
+        return value
 
 
 def get_parsers():
@@ -124,7 +124,7 @@
 
 
 def requires_section(section):
-    """decorator to enfornce the exitense of a section in the config."""
+    """decorator to enforce the existence of a section in the config."""
     def wrapper(meth):
         """the wrapper"""
         def wrapped(self, *args, **kwargs):