Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu

This commit is contained in:
gwen 2013-08-28 09:22:50 +02:00
commit fc9aa7fad5
8 changed files with 178 additions and 26 deletions

View File

@ -6,7 +6,7 @@ Options handling basics
Tiramisu is made of almost three main objects :
- :class:`tiramisu.config.Config` witch is the whole configuration entry point
- :class:`tiramisu.config.Config` which is the whole configuration entry point
- :class:`tiramisu.option.Option` stands for the option types
- :class:`tiramisu.option.OptionDescription` is the shema, the option's structure

111
test/test_dereference.py Normal file
View File

@ -0,0 +1,111 @@
# coding: utf-8
import autopath
#from py.test import raises
from tiramisu.config import Config
from tiramisu.option import BoolOption, OptionDescription
import weakref
def test_deref_storage():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
c = Config(o)
w = weakref.ref(c.cfgimpl_get_values()._p_)
del(c)
assert w() is None
def test_deref_value():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
c = Config(o)
w = weakref.ref(c.cfgimpl_get_values())
del(c)
assert w() is None
def test_deref_setting():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
c = Config(o)
w = weakref.ref(c.cfgimpl_get_settings())
del(c)
assert w() is None
def test_deref_config():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
c = Config(o)
w = weakref.ref(c)
del(c)
assert w() is None
def test_deref_option():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
w = weakref.ref(b)
del(b)
assert w() is not None
del(o)
assert w() is None
def test_deref_optiondescription():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
w = weakref.ref(o)
del(b)
assert w() is not None
del(o)
assert w() is None
def test_deref_option_cache():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
o.impl_build_cache()
w = weakref.ref(b)
del(b)
assert w() is not None
del(o)
assert w() is None
def test_deref_optiondescription_cache():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
o.impl_build_cache()
w = weakref.ref(o)
del(b)
assert w() is not None
del(o)
assert w() is None
def test_deref_option_config():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
c = Config(o)
w = weakref.ref(b)
del(b)
assert w() is not None
del(o)
assert w() is not None
del(c)
assert w() is None
def test_deref_optiondescription_config():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
c = Config(o)
w = weakref.ref(o)
del(b)
assert w() is not None
del(o)
assert w() is not None
del(c)
assert w() is None

View File

@ -1,8 +1,11 @@
# coding: utf-8
import autopath
#from py.test import raises
from tiramisu.config import Config
from tiramisu.option import BoolOption, OptionDescription
from tiramisu.setting import owners
from tiramisu.setting import list_sessions, delete_session
def test_non_persistent():
@ -53,7 +56,6 @@ def test_delete_session_persistent():
# storage is not persistent
pass
else:
from tiramisu.setting import list_sessions, delete_session
assert 'test_persistent' in list_sessions()
delete_session('test_persistent')
assert 'test_persistent' not in list_sessions()
@ -74,8 +76,51 @@ def test_create_persistent_retrieve():
del(c)
c = Config(o, session_id='test_persistent', persistent=True)
assert c.b is True
from tiramisu.setting import list_sessions, delete_session
assert 'test_persistent' in list_sessions()
delete_session('test_persistent')
c = Config(o, session_id='test_persistent', persistent=True)
assert c.b is None
delete_session('test_persistent')
def test_two_persistent():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
try:
c = Config(o, session_id='test_persistent', persistent=True)
except ValueError:
# storage is not persistent
pass
else:
c2 = Config(o, session_id='test_persistent', persistent=True)
assert c.b is None
assert c2.b is None
c.b = False
assert c.b is False
assert c2.b is False
c.b = True
assert c.b is True
assert c2.b is True
delete_session('test_persistent')
def test_two_persistent_owner():
b = BoolOption('b', '')
o = OptionDescription('od', '', [b])
try:
c = Config(o, session_id='test_persistent', persistent=True)
except ValueError:
# storage is not persistent
pass
else:
c2 = Config(o, session_id='test_persistent', persistent=True)
owners.addowner('persistent')
assert c.getowner(b) == owners.default
assert c2.getowner(b) == owners.default
c.b = False
assert c.getowner(b) == owners.user
assert c2.getowner(b) == owners.user
c.cfgimpl_get_values().setowner(b, owners.persistent)
assert c.getowner(b) == owners.persistent
assert c2.getowner(b) == owners.persistent
delete_session('test_persistent')

View File

@ -99,7 +99,7 @@ class Option(BaseInformation):
__slots__ = ('_name', '_requires', '_multi', '_validator',
'_default_multi', '_default', '_properties', '_callback',
'_multitype', '_master_slaves', '_consistencies', '_empty',
'_calc_properties')
'_calc_properties', '__weakref__')
_empty = ''
def __init__(self, name, doc, default=None, default_multi=None,
@ -714,7 +714,7 @@ class OptionDescription(BaseInformation):
"""
__slots__ = ('_name', '_requires', '_cache_paths', '_group_type',
'_properties', '_children', '_consistencies',
'_calc_properties')
'_calc_properties', '__weakref__')
def __init__(self, name, doc, children, requires=None, properties=None):
"""
@ -801,8 +801,8 @@ class OptionDescription(BaseInformation):
else:
save = False
if cache_path is None:
cache_path = [self._name]
cache_option = [self]
cache_path = []
cache_option = []
for option in self.impl_getchildren():
attr = option._name
if attr.startswith('_cfgimpl'):
@ -929,7 +929,7 @@ def validate_requires_arg(requires, name):
:param requires: have a look at the
:meth:`tiramisu.setting.Settings.apply_requires` method to
know more about
the description of the requires dictionnary
the description of the requires dictionary
"""
if requires is None:
return None, None
@ -1002,11 +1002,8 @@ def validate_requires_arg(requires, name):
for opt_requires in ret_requires.values():
ret_action = []
for require in opt_requires.values():
req = (require[0], tuple(require[1]),
require[2],
require[3],
require[4],
require[5])
req = (require[0], tuple(require[1]), require[2], require[3],
require[4], require[5])
ret_action.append(req)
ret.append(tuple(ret_action))
return frozenset(config_action.keys()), tuple(ret)

View File

@ -222,9 +222,8 @@ def get_storage(context, session_id, persistent):
if session_id is None:
session_id = gen_id(context)
a=__import__(storage_type.get_storage(), globals(), locals(),
return __import__(storage_type.get_storage(), globals(), locals(),
['Storage'], -1).Storage(session_id, persistent)
return a
def list_sessions():
@ -240,7 +239,7 @@ def delete_session(session_id):
#____________________________________________________________
class Settings(object):
"``Config()``'s configuration options"
__slots__ = ('context', '_owner', '_p_')
__slots__ = ('context', '_owner', '_p_', '__weakref__')
def __init__(self, context, storage):
"""

View File

@ -22,7 +22,7 @@ from tiramisu.storage.dictionary.storage import Cache
class Values(Cache):
__slots__ = ('_values',)
__slots__ = ('_values', '__weakref__')
def __init__(self, storage):
"""init plugin means create values storage

View File

@ -23,7 +23,7 @@ from tiramisu.setting import owners
class Values(Cache):
__slots__ = tuple()
__slots__ = ('__weakref__',)
def __init__(self, storage):
"""init plugin means create values storage

View File

@ -32,7 +32,7 @@ class Values(object):
but the values are physicaly located here, in `Values`, wich is also
responsible of a caching utility.
"""
__slots__ = ('context', '_p_')
__slots__ = ('context', '_p_', '__weakref__')
def __init__(self, context, storage):
"""