andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

config: Make tests discoverable and fix broken ones

Browse Source
This commit is contained in:
Thomas Adamcik 2013-04-14 23:52:39 +02:00
parent ceee6630fa
commit 805733a2aa
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy/config/__init__.py
View File

@ -107,7 +107,7 @@ def _validate(raw_config, schemas):
items = raw_config[schema.name].items() items = raw_config[schema.name].items()
config[schema.name] = schema.convert(items) config[schema.name] = schema.convert(items)
except KeyError: except KeyError:
errors.append('%s: section not found.' % name) errors.append('%s: section not found.' % schema.name)
except exceptions.ConfigError as error: except exceptions.ConfigError as error:
for key in error: for key in error:
errors.append('%s/%s: %s' % (schema.name, key, error[key])) errors.append('%s/%s: %s' % (schema.name, key, error[key]))

0
tests/config/__init__.py Normal file
View File

6
tests/config/config_test.py
View File

@ -12,14 +12,14 @@ class LoadConfigTest(unittest.TestCase):
self.assertEqual({}, config._load([], [], [])) self.assertEqual({}, config._load([], [], []))
def test_load_single_default(self): def test_load_single_default(self):
default = '[foo]\nbar = baz' default = b'[foo]\nbar = baz'
expected = {'foo': {'bar': 'baz'}} expected = {'foo': {'bar': 'baz'}}
result = config._load([], [default], []) result = config._load([], [default], [])
self.assertEqual(expected, result) self.assertEqual(expected, result)
def test_load_defaults(self): def test_load_defaults(self):
default1 = '[foo]\nbar = baz' default1 = b'[foo]\nbar = baz'
default2 = '[foo2]\n' default2 = b'[foo2]\n'
expected = {'foo': {'bar': 'baz'}, 'foo2': {}} expected = {'foo': {'bar': 'baz'}, 'foo2': {}}
result = config._load([], [default1, default2], []) result = config._load([], [default1, default2], [])
self.assertEqual(expected, result) self.assertEqual(expected, result)

2
tests/config/schemas_test.py
View File

@ -94,7 +94,7 @@ class ExtensionConfigSchemaTest(unittest.TestCase):
class LogLevelConfigSchemaTest(unittest.TestCase): class LogLevelConfigSchemaTest(unittest.TestCase):
def test_conversion(self): def test_conversion(self):
schema = schemas.LogLevelConfigSchema() schema = schemas.LogLevelConfigSchema('test')
result = schema.convert([('foo.bar', 'DEBUG'), ('baz', 'INFO')]) result = schema.convert([('foo.bar', 'DEBUG'), ('baz', 'INFO')])
self.assertEqual(logging.DEBUG, result['foo.bar']) self.assertEqual(logging.DEBUG, result['foo.bar'])