From 9cb84002bc550c44568f408e20cdfe34ac332841 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 17 Aug 2010 01:58:31 +0200 Subject: [PATCH] Report multiple settings errors at once --- mopidy/utils/settings.py | 6 +++--- tests/utils/settings_test.py | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py index d06e822a..78982e8a 100644 --- a/mopidy/utils/settings.py +++ b/mopidy/utils/settings.py @@ -83,17 +83,17 @@ def validate_settings(defaults, settings): else: errors[setting] = u'Deprecated setting. Use %s.' % ( changed[setting],) - break + continue if setting == 'BACKENDS': if 'mopidy.backends.despotify.DespotifyBackend' in value: errors[setting] = (u'Deprecated setting value. ' + '"mopidy.backends.despotify.DespotifyBackend" is no ' + 'longer available.') - break + continue if setting not in defaults: errors[setting] = u'Unknown setting. Is it misspelled?' - break + continue return errors diff --git a/tests/utils/settings_test.py b/tests/utils/settings_test.py index 0e1076c9..5bf0f9b4 100644 --- a/tests/utils/settings_test.py +++ b/tests/utils/settings_test.py @@ -38,3 +38,8 @@ class ValidateSettingsTest(unittest.TestCase): u'Deprecated setting value. ' + '"mopidy.backends.despotify.DespotifyBackend" is no longer ' + 'available.') + + def test_two_errors_are_both_reported(self): + result = validate_settings(self.defaults, + {'FOO': '', 'BAR': ''}) + self.assertEquals(len(result), 2)