Merge lp:~configglue/configglue/schemaconfig-integration-fixes into lp:configglue/schemaconfig-integration

[Ricardo Kirkner]

upped test coverage

[lp:~configglue/configglue/schemaconfig-integration-fixes]

26. By Ricardo Kirkner on 2010-08-05

fixed failing unicode test

[John Lenton (chipaca)]

yay

review: Approve

=== modified file 'configglue/inischema/glue.py'
--- configglue/inischema/glue.py	2010-08-04 22:39:36 +0000
+++ configglue/inischema/glue.py	2010-08-05 13:02:41 +0000
@@ -19,10 +19,10 @@
 """
 from __future__ import absolute_import
 
+from configglue.pyschema import schemaconfigglue, ini2schema
+
 __all__ = ('configglue',)
 
-from configglue.pyschema import schemaconfigglue, ini2schema
-
 def configglue(fileobj, *filenames, **kwargs):
     args = kwargs.pop('args', None)
     return schemaconfigglue(ini2schema(fileobj), argv=args)

=== modified file 'tests/inischema/test_parsers.py'
--- tests/inischema/test_parsers.py	2010-07-31 01:15:59 +0000
+++ tests/inischema/test_parsers.py	2010-08-05 13:02:41 +0000
@@ -33,5 +33,15 @@
         for value in ('xyzzy', '', '-1', '0.', '0.1'):
             self.assertRaises(ValueError, parsers.bool_parser, value)
 
+    def test_bool_not_string(self):
+        self.assertEqual(parsers.bool_parser(1), True)
+
+    def test_bool_is_None(self):
+        self.assertEqual(parsers.bool_parser(None), False)
+
     def test_lines(self):
         self.assertEqual(parsers.lines('abc\ndef'), ['abc', 'def'])
+
+    def test_lines_not_string(self):
+        self.assertEqual(parsers.lines(42), 42)
+

=== modified file 'tests/inischema/test_typed.py'
--- tests/inischema/test_typed.py	2010-07-31 01:15:59 +0000
+++ tests/inischema/test_typed.py	2010-08-05 13:02:41 +0000
@@ -56,9 +56,13 @@
 quux = \xe1rbol
 quux.parser = unicode
 quux.parser.args = utf-8
-                   ignore
+                   replace
 
 thud.help = this is the help for thud
+
+woof.default = marker
+woof.default.parser = some.parser
+woof.parser = bool
 '''
         self.config = TypedConfigParser()
         self.config.readfp(StringIO(self.config_string))
@@ -90,6 +94,10 @@
     def test_value_is_default_if_empty(self):
         self.config.parse('xyzzy', 'foo')
         self.assertEqual(self.config.get('xyzzy', 'foo').value, 1j)
+    def test_parse_default_parser(self):
+        self.config.add_parser('some.parser', some_parser)
+        self.config.parse('xyzzy', 'woof')
+        self.assertTrue(self.config.get('xyzzy', 'woof').value)
     def test_parse_all_parses_all(self):
         self.config.add_parser('some.parser', some_parser)
         self.config.add_parser('more.parser', some_parser)
@@ -102,8 +110,10 @@
                                      ('baz2', None),
                                      ('foo', 1j),
                                      ('meep', u'\xe1rbol'),
-                                     ('quux', u'rbol'),
+                                     ('quux', unicode('\xe1rbol', 'utf-8',
+                                                      'replace')),
                                      ('thud', None),
+                                     ('woof', True),
                                      ])])
     def test_add_multiple_parsers(self):
         self.config.add_parsers(('some.parser', some_parser),