diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py index 98ab9055..0267aff5 100644 --- a/mopidy/config/__init__.py +++ b/mopidy/config/__init__.py @@ -107,7 +107,7 @@ def _validate(raw_config, schemas): items = raw_config[schema.name].items() config[schema.name] = schema.convert(items) except KeyError: - errors.append('%s: section not found.' % name) + errors.append('%s: section not found.' % schema.name) except exceptions.ConfigError as error: for key in error: errors.append('%s/%s: %s' % (schema.name, key, error[key])) diff --git a/tests/config/__init__.py b/tests/config/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/config/config_test.py b/tests/config/config_test.py index dc1b1c59..c90486c7 100644 --- a/tests/config/config_test.py +++ b/tests/config/config_test.py @@ -12,14 +12,14 @@ class LoadConfigTest(unittest.TestCase): self.assertEqual({}, config._load([], [], [])) def test_load_single_default(self): - default = '[foo]\nbar = baz' + default = b'[foo]\nbar = baz' expected = {'foo': {'bar': 'baz'}} result = config._load([], [default], []) self.assertEqual(expected, result) def test_load_defaults(self): - default1 = '[foo]\nbar = baz' - default2 = '[foo2]\n' + default1 = b'[foo]\nbar = baz' + default2 = b'[foo2]\n' expected = {'foo': {'bar': 'baz'}, 'foo2': {}} result = config._load([], [default1, default2], []) self.assertEqual(expected, result) diff --git a/tests/config/schemas_test.py b/tests/config/schemas_test.py index 487136c2..6274f66c 100644 --- a/tests/config/schemas_test.py +++ b/tests/config/schemas_test.py @@ -94,7 +94,7 @@ class ExtensionConfigSchemaTest(unittest.TestCase): class LogLevelConfigSchemaTest(unittest.TestCase): def test_conversion(self): - schema = schemas.LogLevelConfigSchema() + schema = schemas.LogLevelConfigSchema('test') result = schema.convert([('foo.bar', 'DEBUG'), ('baz', 'INFO')]) self.assertEqual(logging.DEBUG, result['foo.bar'])