From 12ff51ceba81d1d28d666ee226a9cc3a77506878 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 2 Apr 2013 11:34:33 +0200 Subject: [PATCH] ext: Replace validate_config() with get_config_schema() --- mopidy/ext.py | 7 ++++--- tests/ext_test.py | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mopidy/ext.py b/mopidy/ext.py index 6cc35139..0097d8c6 100644 --- a/mopidy/ext.py +++ b/mopidy/ext.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals +from mopidy.utils import config + class Extension(object): @@ -10,9 +12,8 @@ class Extension(object): raise NotImplementedError( 'Add at least a config section with "enabled = true"') - def validate_config(self, config): - raise NotImplementedError( - 'You must explicitly pass config validation if not needed') + def get_config_schema(self): + return config.ExtensionConfigSchema() def validate_environment(self): pass diff --git a/tests/ext_test.py b/tests/ext_test.py index ac238ca5..d279b52f 100644 --- a/tests/ext_test.py +++ b/tests/ext_test.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals from mopidy.ext import Extension +from mopidy.utils import config from tests import unittest @@ -18,8 +19,10 @@ class ExtensionTest(unittest.TestCase): def test_get_default_config_raises_not_implemented(self): self.assertRaises(NotImplementedError, self.ext.get_default_config) - def test_validate_config_raises_not_implemented(self): - self.assertRaises(NotImplementedError, self.ext.validate_config, None) + def test_get_config_schema_returns_extension_schema(self): + schema = self.ext.get_config_schema() + self.assertIsInstance(schema, config.ExtensionConfigSchema) + self.assertIsInstance(schema['enabled'], config.Boolean) def test_validate_environment_does_nothing_by_default(self): self.assertIsNone(self.ext.validate_environment())