Merge branch 'master' into orm
This commit is contained in:
commit
7c8049a8d0
|
@ -6,6 +6,7 @@ from tiramisu.config import Config
|
||||||
from tiramisu.option import StrOption, OptionDescription
|
from tiramisu.option import StrOption, OptionDescription
|
||||||
from tiramisu.setting import groups
|
from tiramisu.setting import groups
|
||||||
from tiramisu.error import ValueWarning
|
from tiramisu.error import ValueWarning
|
||||||
|
from tiramisu.i18n import _
|
||||||
|
|
||||||
|
|
||||||
def return_true(value, param=None):
|
def return_true(value, param=None):
|
||||||
|
@ -89,7 +90,7 @@ def test_validator_warning():
|
||||||
cfg.opt2 = 'val'
|
cfg.opt2 = 'val'
|
||||||
assert len(w) == 1
|
assert len(w) == 1
|
||||||
assert w[0].message.opt == opt2
|
assert w[0].message.opt == opt2
|
||||||
assert str(w[0].message) == 'invalid value for option opt2: error'
|
assert str(w[0].message) == _('invalid value for option {0}: {1}').format('opt2', 'error')
|
||||||
#
|
#
|
||||||
with warnings.catch_warnings(record=True) as w:
|
with warnings.catch_warnings(record=True) as w:
|
||||||
cfg.opt3.append('val')
|
cfg.opt3.append('val')
|
||||||
|
@ -99,7 +100,7 @@ def test_validator_warning():
|
||||||
cfg.opt3.append('val1')
|
cfg.opt3.append('val1')
|
||||||
assert len(w) == 1
|
assert len(w) == 1
|
||||||
assert w[0].message.opt == opt3
|
assert w[0].message.opt == opt3
|
||||||
assert str(w[0].message) == 'invalid value for option opt3: error'
|
assert str(w[0].message) == _('invalid value for option {0}: {1}').format('opt3', 'error')
|
||||||
raises(ValueError, "cfg.opt2 = 1")
|
raises(ValueError, "cfg.opt2 = 1")
|
||||||
#
|
#
|
||||||
with warnings.catch_warnings(record=True) as w:
|
with warnings.catch_warnings(record=True) as w:
|
||||||
|
@ -107,9 +108,9 @@ def test_validator_warning():
|
||||||
cfg.opt3.append('val')
|
cfg.opt3.append('val')
|
||||||
assert len(w) == 2
|
assert len(w) == 2
|
||||||
assert w[0].message.opt == opt2
|
assert w[0].message.opt == opt2
|
||||||
assert str(w[0].message) == 'invalid value for option opt2: error'
|
assert str(w[0].message) == _('invalid value for option {0}: {1}').format('opt2', 'error')
|
||||||
assert w[1].message.opt == opt3
|
assert w[1].message.opt == opt3
|
||||||
assert str(w[1].message) == 'invalid value for option opt3: error'
|
assert str(w[1].message) == _('invalid value for option {0}: {1}').format('opt3', 'error')
|
||||||
|
|
||||||
|
|
||||||
def test_validator_warning_master_slave():
|
def test_validator_warning_master_slave():
|
||||||
|
@ -129,29 +130,29 @@ def test_validator_warning_master_slave():
|
||||||
cfg.ip_admin_eth0.netmask_admin_eth0 = ['val1']
|
cfg.ip_admin_eth0.netmask_admin_eth0 = ['val1']
|
||||||
assert len(w) == 1
|
assert len(w) == 1
|
||||||
assert w[0].message.opt == netmask_admin_eth0
|
assert w[0].message.opt == netmask_admin_eth0
|
||||||
assert str(w[0].message) == 'invalid value for option netmask_admin_eth0: error'
|
assert str(w[0].message) == _('invalid value for option {0}: {1}').format('netmask_admin_eth0', 'error')
|
||||||
#
|
#
|
||||||
with warnings.catch_warnings(record=True) as w:
|
with warnings.catch_warnings(record=True) as w:
|
||||||
cfg.ip_admin_eth0.ip_admin_eth0 = ['val']
|
cfg.ip_admin_eth0.ip_admin_eth0 = ['val']
|
||||||
assert len(w) == 1
|
assert len(w) == 1
|
||||||
assert w[0].message.opt == ip_admin_eth0
|
assert w[0].message.opt == ip_admin_eth0
|
||||||
assert str(w[0].message) == 'invalid value for option ip_admin_eth0: error'
|
assert str(w[0].message) == _('invalid value for option {0}: {1}').format('ip_admin_eth0', 'error')
|
||||||
#
|
#
|
||||||
with warnings.catch_warnings(record=True) as w:
|
with warnings.catch_warnings(record=True) as w:
|
||||||
cfg.ip_admin_eth0.ip_admin_eth0 = ['val', 'val1', 'val1']
|
cfg.ip_admin_eth0.ip_admin_eth0 = ['val', 'val1', 'val1']
|
||||||
assert len(w) == 1
|
assert len(w) == 1
|
||||||
assert w[0].message.opt == ip_admin_eth0
|
assert w[0].message.opt == ip_admin_eth0
|
||||||
assert str(w[0].message) == 'invalid value for option ip_admin_eth0: error'
|
assert str(w[0].message) == _('invalid value for option {0}: {1}').format('ip_admin_eth0', 'error')
|
||||||
#
|
#
|
||||||
with warnings.catch_warnings(record=True) as w:
|
with warnings.catch_warnings(record=True) as w:
|
||||||
cfg.ip_admin_eth0.ip_admin_eth0 = ['val1', 'val', 'val1']
|
cfg.ip_admin_eth0.ip_admin_eth0 = ['val1', 'val', 'val1']
|
||||||
assert len(w) == 1
|
assert len(w) == 1
|
||||||
assert w[0].message.opt == ip_admin_eth0
|
assert w[0].message.opt == ip_admin_eth0
|
||||||
assert str(w[0].message) == 'invalid value for option ip_admin_eth0: error'
|
assert str(w[0].message) == _('invalid value for option {0}: {1}').format('ip_admin_eth0', 'error')
|
||||||
#
|
#
|
||||||
warnings.resetwarnings()
|
warnings.resetwarnings()
|
||||||
with warnings.catch_warnings(record=True) as w:
|
with warnings.catch_warnings(record=True) as w:
|
||||||
cfg.ip_admin_eth0.ip_admin_eth0 = ['val1', 'val1', 'val']
|
cfg.ip_admin_eth0.ip_admin_eth0 = ['val1', 'val1', 'val']
|
||||||
assert len(w) == 1
|
assert len(w) == 1
|
||||||
assert w[0].message.opt == ip_admin_eth0
|
assert w[0].message.opt == ip_admin_eth0
|
||||||
assert str(w[0].message) == 'invalid value for option ip_admin_eth0: error'
|
assert str(w[0].message) == _('invalid value for option {0}: {1}').format('ip_admin_eth0', 'error')
|
||||||
|
|
Loading…
Reference in New Issue