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

config: Support lists in required validator

Browse Source
This commit is contained in:
Thomas Adamcik 2013-04-15 00:07:07 +02:00
parent 805733a2aa
commit 4826dc7cac
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy/config/validators.py
View File

@ -9,7 +9,7 @@ def validate_required(value, required):
Normally called in :meth:`~mopidy.config.types.ConfigValue.deserialize` on Normally called in :meth:`~mopidy.config.types.ConfigValue.deserialize` on
the raw string, _not_ the converted value. the raw string, _not_ the converted value.
""" """
if required and not value.strip(): if required and not value:
raise ValueError('must be set.') raise ValueError('must be set.')

4
tests/config/validator_tests.py
View File

@ -57,11 +57,13 @@ class ValidateRequiredTest(unittest.TestCase):
validators.validate_required('foo', False) validators.validate_required('foo', False)
validators.validate_required('', False) validators.validate_required('', False)
validators.validate_required(' ', False) validators.validate_required(' ', False)
validators.validate_required([], False)
def test_passes_when_required_and_set(self): def test_passes_when_required_and_set(self):
validators.validate_required('foo', True) validators.validate_required('foo', True)
validators.validate_required(' foo ', True) validators.validate_required(' foo ', True)
validators.validate_required([1], True)
def test_blocks_when_required_and_emtpy(self): def test_blocks_when_required_and_emtpy(self):
self.assertRaises(ValueError, validators.validate_required, '', True) self.assertRaises(ValueError, validators.validate_required, '', True)
self.assertRaises(ValueError, validators.validate_required, ' ', True) self.assertRaises(ValueError, validators.validate_required, [], True)