value None in multi values

This commit is contained in:
gwen
2012-07-11 12:30:45 +02:00
parent 3780b6f947
commit 4ec7dff6c4
5 changed files with 58 additions and 27 deletions

View File

@ -7,7 +7,7 @@ from error import SpecialOwnersError
def make_description():
gcoption = ChoiceOption('name', 'GC name', ['ref', 'framework'], 'ref')
gcdummy = BoolOption('dummy', 'dummy', default=False, callback="toto")
gcdummy = BoolOption('dummy', 'dummy', callback="toto")
objspaceoption = ChoiceOption('objspace', 'Object space',
['std', 'thunk'], 'std')
booloption = BoolOption('bool', 'Test boolean option', default=True)
@ -75,15 +75,15 @@ def test_change_owner():
# Still not getting it ? read the docs
config.gc.dummy = True
assert config.gc._cfgimpl_value_owners['dummy'] == 'user'
config.cfgimpl_set_owner('eggs')
config.set(dummy=False)
assert config.gc._cfgimpl_value_owners['dummy'] == 'eggs'
config.cfgimpl_set_owner('spam')
gcdummy = config.unwrap_from_path('gc.dummy')
gcdummy.setowner(config.gc, 'blabla')
assert config.gc._cfgimpl_value_owners['dummy'] == 'blabla'
config.gc.dummy = True
assert config.gc._cfgimpl_value_owners['dummy'] == 'spam'
# config.cfgimpl_set_owner('eggs')
# config.set(dummy=False)
# assert config.gc._cfgimpl_value_owners['dummy'] == 'eggs'
# config.cfgimpl_set_owner('spam')
# gcdummy = config.unwrap_from_path('gc.dummy')
# gcdummy.setowner(config.gc, 'blabla')
# assert config.gc._cfgimpl_value_owners['dummy'] == 'blabla'
# config.gc.dummy = True
# assert config.gc._cfgimpl_value_owners['dummy'] == 'spam'
#____________________________________________________________
# special owners

View File

@ -37,11 +37,13 @@ def test_attribute_access():
assert config.string == "foo"
def test_setitem():
s = StrOption("string", "", default=["string"], multi=True)
s = StrOption("string", "", default=["string", None, "sdfsdf"], default_multi="prout", multi=True)
descr = OptionDescription("options", "", [s])
config = Config(descr)
config.string = ["foo", "eggs"]
config._cfgimpl_values['string'].append("eggs")
# config.string = ["string"].append("eggs")
print config.string
# config.string[1] = "titi"
def test_reset():
"if value is None, resets to default owner"
@ -68,6 +70,17 @@ def test_reset_with_multi():
assert config.string == ["string"]
assert config._cfgimpl_value_owners['string'] == ['default']
raises(ConfigError, "config.string = None")
def test_default_with_multi():
"default with multi is a list"
s = StrOption("string", "", default=[], default_multi="string" , multi=True)
descr = OptionDescription("options", "", [s])
config = Config(descr)
assert config.string == []
s = StrOption("string", "", default=None, default_multi="string" , multi=True)
descr = OptionDescription("options", "", [s])
config = Config(descr)
assert config.string == []
def test_idontexist():
descr = make_description()

View File

@ -41,12 +41,12 @@ def test_base_config():
assert config.creole.general.nom_machine == "eoleng"
assert config.get('nom_machine') == "eoleng"
result = {'general.numero_etab': None, 'general.nombre_interfaces': 1,
'general.serveur_ntp': None, 'interface1.ip_admin_eth0.ip_admin_eth0': None,
'general.serveur_ntp': [], 'interface1.ip_admin_eth0.ip_admin_eth0': None,
'general.mode_conteneur_actif': False, 'general.time_zone': 'Paris',
'interface1.ip_admin_eth0.netmask_admin_eth0': None, 'general.nom_machine':
'eoleng', 'general.activer_proxy_client': False}
assert make_dict(config.creole) == result
result = {'serveur_ntp': None, 'mode_conteneur_actif': False,
result = {'serveur_ntp': [], 'mode_conteneur_actif': False,
'ip_admin_eth0': None, 'time_zone': 'Paris', 'numero_etab': None,
'netmask_admin_eth0': None, 'nom_machine': 'eoleng', 'activer_proxy_client':
False, 'nombre_interfaces': 1}