This commit is contained in:
@@ -48,8 +48,8 @@ class DefaultSettingTestCase(SimpleTestCase):
|
||||
|
||||
re_validator = r'[a-z]'
|
||||
|
||||
valid_values = u'aocd'
|
||||
invalid_values = u'Aö1.'
|
||||
valid_values = 'aocd'
|
||||
invalid_values = 'Aö1.'
|
||||
|
||||
setting = DefaultSetting(name, None, validator=re_validator)
|
||||
for val in valid_values:
|
||||
@@ -89,7 +89,7 @@ class AppSettingsTestCase(SimpleTestCase):
|
||||
DefaultSetting('no_test_setting', ImproperlyConfigured),
|
||||
)
|
||||
with self.assertRaisesRegex(ImproperlyConfigured, 'NO_TEST_SETTING must be defined in main.settings-dav_base'):
|
||||
app_settings = AppSettings(self.app_name, default_settings)
|
||||
_ = AppSettings(self.app_name, default_settings)
|
||||
|
||||
def test_improperlyconfigured_by_instance(self):
|
||||
"""Test if mandatory but unset setting raise correct exception"""
|
||||
@@ -97,17 +97,17 @@ class AppSettingsTestCase(SimpleTestCase):
|
||||
DefaultSetting('no_test_setting', ImproperlyConfigured('Some Error Message')),
|
||||
)
|
||||
with self.assertRaisesRegex(ImproperlyConfigured, 'Some Error Message'):
|
||||
app_settings = AppSettings(self.app_name, default_settings)
|
||||
_ = AppSettings(self.app_name, default_settings)
|
||||
|
||||
def test_improperlyconfigured_by_func(self):
|
||||
"""Test if invalid setting raise correct exception"""
|
||||
def validator(value):
|
||||
def validator(value): # pylint: disable=unused-argument
|
||||
return False
|
||||
default_settings = (
|
||||
DefaultSetting('test_setting', 1, validator=validator),
|
||||
)
|
||||
with self.assertRaises(ImproperlyConfigured):
|
||||
app_settings = AppSettings(self.app_name, default_settings)
|
||||
_ = AppSettings(self.app_name, default_settings)
|
||||
|
||||
def test_improperlyconfigured_by_regex(self):
|
||||
"""Test if invalid setting raise correct exception"""
|
||||
@@ -115,7 +115,7 @@ class AppSettingsTestCase(SimpleTestCase):
|
||||
DefaultSetting('test_setting', 1, validator=r'^[01]$'),
|
||||
)
|
||||
with self.assertRaises(ImproperlyConfigured):
|
||||
app_settings = AppSettings(self.app_name, default_settings)
|
||||
_ = AppSettings(self.app_name, default_settings)
|
||||
|
||||
def test_settings_from_file(self):
|
||||
"""Test if value from settings file eliminate exception"""
|
||||
@@ -145,7 +145,7 @@ class AppSettingsTestCase(SimpleTestCase):
|
||||
class AppConfigTestCase(SimpleTestCase):
|
||||
def test_init(self):
|
||||
app_name = 'dav_base'
|
||||
import dav_base as app_module
|
||||
import dav_base as app_module # pylint: disable=import-outside-toplevel
|
||||
|
||||
test_default_settings = (
|
||||
DefaultSetting('test_setting', ImproperlyConfigured),
|
||||
@@ -154,7 +154,7 @@ class AppConfigTestCase(SimpleTestCase):
|
||||
|
||||
class TestAppConfig(AppConfig):
|
||||
name = 'not_dav_base'
|
||||
verbose_name = u'DAV Base App'
|
||||
verbose_name = 'DAV Base App'
|
||||
default_settings = test_default_settings
|
||||
|
||||
app_config = TestAppConfig(app_name, app_module)
|
||||
|
||||
Reference in New Issue
Block a user