Switch to only importing modules in settings_test.
This commit is contained in:
parent
4e4a209ec3
commit
1f8289a256
@ -1,8 +1,7 @@
|
||||
import os
|
||||
|
||||
from mopidy import settings as default_settings_module, SettingsError
|
||||
from mopidy.utils.settings import (format_settings_list, mask_value_if_secret,
|
||||
SettingsProxy, validate_settings)
|
||||
import mopidy
|
||||
from mopidy.utils import settings as setting_utils
|
||||
|
||||
from tests import unittest
|
||||
|
||||
@ -16,29 +15,29 @@ class ValidateSettingsTest(unittest.TestCase):
|
||||
}
|
||||
|
||||
def test_no_errors_yields_empty_dict(self):
|
||||
result = validate_settings(self.defaults, {})
|
||||
result = setting_utils.validate_settings(self.defaults, {})
|
||||
self.assertEqual(result, {})
|
||||
|
||||
def test_unknown_setting_returns_error(self):
|
||||
result = validate_settings(self.defaults,
|
||||
result = setting_utils.validate_settings(self.defaults,
|
||||
{'MPD_SERVER_HOSTNMAE': '127.0.0.1'})
|
||||
self.assertEqual(result['MPD_SERVER_HOSTNMAE'],
|
||||
u'Unknown setting. Did you mean MPD_SERVER_HOSTNAME?')
|
||||
|
||||
def test_not_renamed_setting_returns_error(self):
|
||||
result = validate_settings(self.defaults,
|
||||
result = setting_utils.validate_settings(self.defaults,
|
||||
{'SERVER_HOSTNAME': '127.0.0.1'})
|
||||
self.assertEqual(result['SERVER_HOSTNAME'],
|
||||
u'Deprecated setting. Use MPD_SERVER_HOSTNAME.')
|
||||
|
||||
def test_unneeded_settings_returns_error(self):
|
||||
result = validate_settings(self.defaults,
|
||||
result = setting_utils.validate_settings(self.defaults,
|
||||
{'SPOTIFY_LIB_APPKEY': '/tmp/foo'})
|
||||
self.assertEqual(result['SPOTIFY_LIB_APPKEY'],
|
||||
u'Deprecated setting. It may be removed.')
|
||||
|
||||
def test_deprecated_setting_value_returns_error(self):
|
||||
result = validate_settings(self.defaults,
|
||||
result = setting_utils.validate_settings(self.defaults,
|
||||
{'BACKENDS': ('mopidy.backends.despotify.DespotifyBackend',)})
|
||||
self.assertEqual(result['BACKENDS'],
|
||||
u'Deprecated setting value. ' +
|
||||
@ -46,33 +45,33 @@ class ValidateSettingsTest(unittest.TestCase):
|
||||
'available.')
|
||||
|
||||
def test_unavailable_bitrate_setting_returns_error(self):
|
||||
result = validate_settings(self.defaults,
|
||||
result = setting_utils.validate_settings(self.defaults,
|
||||
{'SPOTIFY_BITRATE': 50})
|
||||
self.assertEqual(result['SPOTIFY_BITRATE'],
|
||||
u'Unavailable Spotify bitrate. ' +
|
||||
u'Available bitrates are 96, 160, and 320.')
|
||||
|
||||
def test_two_errors_are_both_reported(self):
|
||||
result = validate_settings(self.defaults,
|
||||
result = setting_utils.validate_settings(self.defaults,
|
||||
{'FOO': '', 'BAR': ''})
|
||||
self.assertEqual(len(result), 2)
|
||||
|
||||
def test_masks_value_if_secret(self):
|
||||
secret = mask_value_if_secret('SPOTIFY_PASSWORD', 'bar')
|
||||
secret = setting_utils.mask_value_if_secret('SPOTIFY_PASSWORD', 'bar')
|
||||
self.assertEqual(u'********', secret)
|
||||
|
||||
def test_does_not_mask_value_if_not_secret(self):
|
||||
not_secret = mask_value_if_secret('SPOTIFY_USERNAME', 'foo')
|
||||
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 = mask_value_if_secret('SPOTIFY_USERNAME', None)
|
||||
not_secret = setting_utils.mask_value_if_secret('SPOTIFY_USERNAME', None)
|
||||
self.assertEqual(None, not_secret)
|
||||
|
||||
|
||||
class SettingsProxyTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.settings = SettingsProxy(default_settings_module)
|
||||
self.settings = setting_utils.SettingsProxy(mopidy.settings)
|
||||
self.settings.local.clear()
|
||||
|
||||
def test_set_and_get_attr(self):
|
||||
@ -83,7 +82,7 @@ class SettingsProxyTest(unittest.TestCase):
|
||||
try:
|
||||
_ = self.settings.TEST
|
||||
self.fail(u'Should raise exception')
|
||||
except SettingsError as e:
|
||||
except mopidy.SettingsError as e:
|
||||
self.assertEqual(u'Setting "TEST" is not set.', e.message)
|
||||
|
||||
def test_getattr_raises_error_on_empty_setting(self):
|
||||
@ -91,7 +90,7 @@ class SettingsProxyTest(unittest.TestCase):
|
||||
try:
|
||||
_ = self.settings.TEST
|
||||
self.fail(u'Should raise exception')
|
||||
except SettingsError as e:
|
||||
except mopidy.SettingsError as e:
|
||||
self.assertEqual(u'Setting "TEST" is empty.', e.message)
|
||||
|
||||
def test_getattr_does_not_raise_error_if_setting_is_false(self):
|
||||
@ -177,44 +176,44 @@ class SettingsProxyTest(unittest.TestCase):
|
||||
|
||||
class FormatSettingListTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.settings = SettingsProxy(default_settings_module)
|
||||
self.settings = setting_utils.SettingsProxy(mopidy.settings)
|
||||
|
||||
def test_contains_the_setting_name(self):
|
||||
self.settings.TEST = u'test'
|
||||
result = format_settings_list(self.settings)
|
||||
result = setting_utils.format_settings_list(self.settings)
|
||||
self.assert_('TEST:' in result, result)
|
||||
|
||||
def test_repr_of_a_string_value(self):
|
||||
self.settings.TEST = u'test'
|
||||
result = format_settings_list(self.settings)
|
||||
result = setting_utils.format_settings_list(self.settings)
|
||||
self.assert_("TEST: u'test'" in result, result)
|
||||
|
||||
def test_repr_of_an_int_value(self):
|
||||
self.settings.TEST = 123
|
||||
result = format_settings_list(self.settings)
|
||||
result = setting_utils.format_settings_list(self.settings)
|
||||
self.assert_("TEST: 123" in result, result)
|
||||
|
||||
def test_repr_of_a_tuple_value(self):
|
||||
self.settings.TEST = (123, u'abc')
|
||||
result = format_settings_list(self.settings)
|
||||
result = setting_utils.format_settings_list(self.settings)
|
||||
self.assert_("TEST: (123, u'abc')" in result, result)
|
||||
|
||||
def test_passwords_are_masked(self):
|
||||
self.settings.TEST_PASSWORD = u'secret'
|
||||
result = format_settings_list(self.settings)
|
||||
result = setting_utils.format_settings_list(self.settings)
|
||||
self.assert_("TEST_PASSWORD: u'secret'" not in result, result)
|
||||
self.assert_("TEST_PASSWORD: u'********'" in result, result)
|
||||
|
||||
def test_short_values_are_not_pretty_printed(self):
|
||||
self.settings.FRONTEND = (u'mopidy.frontends.mpd.MpdFrontend',)
|
||||
result = format_settings_list(self.settings)
|
||||
result = setting_utils.format_settings_list(self.settings)
|
||||
self.assert_("FRONTEND: (u'mopidy.frontends.mpd.MpdFrontend',)" in result,
|
||||
result)
|
||||
|
||||
def test_long_values_are_pretty_printed(self):
|
||||
self.settings.FRONTEND = (u'mopidy.frontends.mpd.MpdFrontend',
|
||||
u'mopidy.frontends.lastfm.LastfmFrontend')
|
||||
result = format_settings_list(self.settings)
|
||||
result = setting_utils.format_settings_list(self.settings)
|
||||
self.assert_("""FRONTEND:
|
||||
(u'mopidy.frontends.mpd.MpdFrontend',
|
||||
u'mopidy.frontends.lastfm.LastfmFrontend')""" in result, result)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user