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

config: Remove old list settings and mask secret code.

Browse Source
This commit is contained in:
Thomas Adamcik 2013-04-02 19:37:51 +02:00
parent 77cdb5b065
commit 3b8fe2fd9f
2 changed files with 0 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mopidy/utils/settings.py
View File

@ -184,42 +184,6 @@ def validate_settings(defaults, settings):
return errors
def list_settings_optparse_callback(*args):
"""
Prints a list of all settings.
Called by optparse when Mopidy is run with the :option:`--list-settings`
option.
"""
from mopidy import settings
print format_settings_list(settings)
sys.exit(0)
def format_settings_list(settings):
errors = settings.get_errors()
lines = []
for (key, value) in sorted(settings.current.iteritems()):
default_value = settings.default.get(key)
masked_value = mask_value_if_secret(key, value)
lines.append('%s: %s' % (
key, formatting.indent(pprint.pformat(masked_value), places=2)))
if value != default_value and default_value is not None:
lines.append(
' Default: %s' %
formatting.indent(pprint.pformat(default_value), places=4))
if errors.get(key) is not None:
lines.append(' Error: %s' % errors[key])
return '\n'.join(lines)
def mask_value_if_secret(key, value):
if key.endswith('PASSWORD') and value:
return '********'
else:
return value
def did_you_mean(setting, defaults):
"""Suggest most likely setting based on levenshtein."""
if not defaults:

62
tests/utils/settings_test.py
View File

@ -59,20 +59,6 @@ class ValidateSettingsTest(unittest.TestCase):
self.defaults, {'FOO': '', 'BAR': ''})
self.assertEqual(len(result), 2)
def test_masks_value_if_secret(self):
secret = setting_utils.mask_value_if_secret('SPOTIFY_PASSWORD', 'bar')
self.assertEqual('********', secret)
def test_does_not_mask_value_if_not_secret(self):
not_secret = setting_utils.mask_value_if_secret(
'SPOTIFY_USERNAME', 'foo')
self.assertEqual('foo', not_secret)
def test_does_not_mask_value_if_none(self):
not_secret = setting_utils.mask_value_if_secret(
'SPOTIFY_USERNAME', None)
self.assertEqual(None, not_secret)
class SettingsProxyTest(unittest.TestCase):
def setUp(self):
@ -179,54 +165,6 @@ class SettingsProxyTest(unittest.TestCase):
self.settings.validate(interactive=True)
class FormatSettingListTest(unittest.TestCase):
def setUp(self):
self.settings = setting_utils.SettingsProxy(settings)
def test_contains_the_setting_name(self):
self.settings.TEST = 'test'
result = setting_utils.format_settings_list(self.settings)
self.assertIn('TEST:', result, result)
def test_repr_of_a_string_value(self):
self.settings.TEST = 'test'
result = setting_utils.format_settings_list(self.settings)
self.assertIn("TEST: u'test'", result, result)
def test_repr_of_an_int_value(self):
self.settings.TEST = 123
result = setting_utils.format_settings_list(self.settings)
self.assertIn("TEST: 123", result, result)
def test_repr_of_a_tuple_value(self):
self.settings.TEST = (123, 'abc')
result = setting_utils.format_settings_list(self.settings)
self.assertIn("TEST: (123, u'abc')", result, result)
def test_passwords_are_masked(self):
self.settings.TEST_PASSWORD = 'secret'
result = setting_utils.format_settings_list(self.settings)
self.assertNotIn("TEST_PASSWORD: u'secret'", result, result)
self.assertIn("TEST_PASSWORD: u'********'", result, result)
def test_short_values_are_not_pretty_printed(self):
self.settings.FRONTEND = ('mopidy.frontends.mpd.MpdFrontend',)
result = setting_utils.format_settings_list(self.settings)
self.assertIn(
"FRONTEND: (u'mopidy.frontends.mpd.MpdFrontend',)", result)
def test_long_values_are_pretty_printed(self):
self.settings.FRONTEND = (
u'mopidy.frontends.mpd.MpdFrontend',
u'mopidy.frontends.lastfm.LastfmFrontend')
result = setting_utils.format_settings_list(self.settings)
self.assertIn(
"FRONTEND: \n"
" (u'mopidy.frontends.mpd.MpdFrontend',\n"
" u'mopidy.frontends.lastfm.LastfmFrontend')",
result)
class DidYouMeanTest(unittest.TestCase):
def testSuggestoins(self):
defaults = {