Infra/tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

review exception

Browse Source
This commit is contained in:
Emmanuel Garette
2013-04-14 12:01:32 +02:00
parent fbcbbfbd2b
commit 9357b342c1
12 changed files with 130 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_config_api.py
View File

@ -167,7 +167,7 @@ def test_find_in_config():
def test_does_not_find_in_config():
descr = make_description()
conf = Config(descr)
raises(NotFoundError, "conf.find(byname='IDontExist')")
raises(AttributeError, "conf.find(byname='IDontExist')")
#def test_validator():
# "validates the integrity of an option towards a whole configuration"

4
test/test_option_consistency.py
View File

@ -242,7 +242,7 @@ def test_has_callback():
dummy = config.unwrap_from_path('gc.dummy')
setting.enable_property('freeze')
setting.add_property('frozen', dummy)
raises(TypeError, "config.gc.dummy = True")
raises(ConfigError, "config.gc.dummy = True")
def test_freeze_and_has_callback_with_setoption():
descr = make_description_callback()
@ -253,5 +253,5 @@ def test_freeze_and_has_callback_with_setoption():
config.cfgimpl_get_settings().enable_property('freeze')
dummy = config.unwrap_from_path('gc.dummy')
config.cfgimpl_get_settings().add_property('frozen', dummy)
raises(TypeError, "config.gc.setoption('dummy', descr.gc.dummy, True)")
raises(ConfigError, "config.gc.setoption('dummy', descr.gc.dummy, True)")
#____________________________________________________________

12
test/test_option_setting.py
View File

@ -69,7 +69,7 @@ def test_reset_with_multi():
config.unwrap_from_path("string").reset(config)
# assert config.string == ["string"]
assert config.cfgimpl_get_values().getowner(s) == 'default'
raises(ValidateError, "config.string = None")
raises(ValueError, "config.string = None")
def test_default_with_multi():
"default with multi is a list"
@ -240,7 +240,7 @@ def test_multi_with_bool_two():
descr = OptionDescription("options", "", [s])
config = Config(descr)
assert descr.bool.is_multi() == True
raises(ValidateError, "config.bool = True")
raises(ValueError, "config.bool = True")
def test_choice_access_with_multi():
ch = ChoiceOption("t1", "", ("a", "b"), default=["a"], multi=True)
@ -278,7 +278,7 @@ def test_dwim_set():
assert not c.b2
assert c.sub.c1 == 'c'
raises(AmbigousOptionError, "c.set(d1=True)")
raises(NoMatchingOptionFound, "c.set(unknown='foo')")
raises(AttributeError, "c.set(unknown='foo')")
def test_more_set():
descr = OptionDescription("opt", "", [
@ -309,7 +309,7 @@ def test_set_with_unknown_option():
IntOption("int", "", default=42)])
d = {'s1.a': True, 'int': 23}
config = Config(descr)
raises(NoMatchingOptionFound, "config.set(**d)")
raises(AttributeError, "config.set(**d)")
def test_set_symlink_option():
@ -380,7 +380,7 @@ def test_allow_multiple_changes_from_config():
def test_access_by_get():
descr = make_description()
cfg = Config(descr)
raises(NotFoundError, "cfg.find(byname='idontexist')" )
raises(AttributeError, "cfg.find(byname='idontexist')" )
assert cfg.find_first(byname='wantref', type_='value') == False
assert cfg.gc.dummy == False
assert cfg.find_first(byname='dummy', type_='value') == False
@ -399,4 +399,4 @@ def test_access_by_get_whith_hide():
c = Config(descr)
setting = c.cfgimpl_get_settings()
setting.read_write()
raises(NotFoundError, "c.find(byname='b1')")
raises(AttributeError, "c.find(byname='b1')")

8
test/test_option_type.py
View File

@ -64,7 +64,7 @@ def test_freeze_whole_config():
settings = conf.cfgimpl_get_settings()
settings.enable_property('everything_frozen')
assert conf.gc.dummy == False
raises(TypeError, "conf.gc.dummy = True")
raises(ConfigError, "conf.gc.dummy = True")
settings.disable_property('everything_frozen')
conf.gc.dummy = True
assert conf.gc.dummy == True
@ -79,7 +79,7 @@ def test_freeze_one_option():
dummy = conf.unwrap_from_path('gc.dummy')
conf.gc.cfgimpl_get_settings().add_property('frozen', dummy)
assert conf.gc.dummy == False
raises(TypeError, "conf.gc.dummy = True")
raises(ConfigError, "conf.gc.dummy = True")
def test_frozen_value():
"setattr a frozen value at the config level"
@ -88,7 +88,7 @@ def test_frozen_value():
config = Config(descr)
settings = config.cfgimpl_get_settings().enable_property('frozen')
config.cfgimpl_get_settings().add_property('frozen', s)
raises(TypeError, 'config.string = "egg"')
raises(ConfigError, 'config.string = "egg"')
def test_freeze():
"freeze a whole configuration object"
@ -97,7 +97,7 @@ def test_freeze():
settings = conf.cfgimpl_get_settings().enable_property('frozen')
name = conf.unwrap_from_path("gc.name")
conf.cfgimpl_get_settings().add_property('frozen', name)
raises(TypeError, "conf.gc.name = 'framework'")
raises(ConfigError, "conf.gc.name = 'framework'")
# ____________________________________________________________
def test_is_hidden():
descr = make_description()

6
test/test_option_with_special_name.py
View File

@ -45,11 +45,11 @@ def test_root_config_answers_ok():
assert cfg.boolop == True
def test_optname_shall_not_start_with_numbers():
raises(NameError, "gcdummy = BoolOption('123dummy', 'dummy', default=False)")
raises(NameError, "descr = OptionDescription('123tiramisu', '', [])")
raises(ValueError, "gcdummy = BoolOption('123dummy', 'dummy', default=False)")
raises(ValueError, "descr = OptionDescription('123tiramisu', '', [])")
#def test_option_has_an_api_name():
# gcdummy = BoolOption('cfgimpl_get_settings', 'dummy', default=False)
# boolop = BoolOption('boolop', 'Test boolean option op', default=True)
# descr = OptionDescription('tiramisu', '', [gcdummy, boolop])
# raises(NameError, "cfg = Config(descr)")
# raises(ValueError, "cfg = Config(descr)")

13
test/test_parsing_group.py
View File

@ -60,10 +60,7 @@ def test_get_group_type():
assert grp.get_group_type() == groups.family
assert grp.get_group_type() == 'family'
assert isinstance(grp.get_group_type(), groups.GroupType)
grp.set_group_type(groups.default)
assert isinstance(grp.get_group_type(), groups.DefaultGroupType)
assert grp.get_group_type() == groups.default
assert grp.get_group_type() == 'default'
raises(TypeError, 'grp.set_group_type(groups.default)')
def test_iter_on_groups():
descr = make_description()
@ -101,26 +98,26 @@ def test_allowed_groups():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=True)
interface1 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
raises(ConfigError, "interface1.set_group_type('toto')")
raises(ValueError, "interface1.set_group_type('toto')")
def test_master_not_valid_name():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=True)
invalid_group = OptionDescription('interface1', '', [ip_admin_eth0, netmask_admin_eth0])
raises(ConfigError, "invalid_group.set_group_type(groups.master)")
raises(ValueError, "invalid_group.set_group_type(groups.master)")
def test_sub_group_in_master_group():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=True)
subgroup = OptionDescription("subgroup", '', [])
invalid_group = OptionDescription('ip_admin_eth0', '', [subgroup, ip_admin_eth0, netmask_admin_eth0])
raises(ConfigError, "invalid_group.set_group_type(groups.master)")
raises(ValueError, "invalid_group.set_group_type(groups.master)")
def test_group_always_has_multis():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau")
group = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
raises(ConfigError, "group.set_group_type(groups.master)")
raises(ValueError, "group.set_group_type(groups.master)")
#____________________________________________________________