better sqlalchemy integration

test/test_config.py

@@ -192,8 +192,12 @@ def test_config_impl_get_opt_by_path():
     config = Config(descr)
     dummy = config.unwrap_from_path('gc.dummy')
     boo = config.unwrap_from_path('bool')
-    assert config.cfgimpl_get_description().impl_get_opt_by_path('bool') == boo
-    assert config.cfgimpl_get_description().impl_get_opt_by_path('gc.dummy') == dummy
+    if 'id' in dir(boo):
+        assert config.cfgimpl_get_description().impl_get_opt_by_path('bool').id == boo.id
+        assert config.cfgimpl_get_description().impl_get_opt_by_path('gc.dummy').id == dummy.id
+    else:
+        assert config.cfgimpl_get_description().impl_get_opt_by_path('bool') == boo
+        assert config.cfgimpl_get_description().impl_get_opt_by_path('gc.dummy') == dummy
     raises(AttributeError, "config.cfgimpl_get_description().impl_get_opt_by_path('gc.unknown')")
 
 

test/test_config_api.py

@@ -37,6 +37,13 @@ def make_description():
     return descr
 
 
+def _is_same_opt(opt1, opt2):
+    if "id" in dir(opt1):
+        assert opt1.id == opt2.id
+    else:
+        assert opt1 == opt2
+
+
 def test_iter_config():
     "iteration on config object"
     s = StrOption("string", "", default="string")
@@ -133,38 +140,70 @@ def test_find_in_config():
     conf = Config(descr)
     conf.read_only()
     conf.cfgimpl_get_settings().setpermissive(('hidden',))
-    assert conf.find(byname='dummy') == [conf.unwrap_from_path('gc.dummy')]
-    assert conf.find(byname='float') == [conf.unwrap_from_path('gc.float'), conf.unwrap_from_path('float')]
-    assert conf.find_first(byname='bool') == conf.unwrap_from_path('gc.gc2.bool')
-    assert conf.find_first(byname='bool', byvalue=True) == conf.unwrap_from_path('bool')
-    assert conf.find_first(byname='dummy') == conf.unwrap_from_path('gc.dummy')
-    assert conf.find_first(byname='float') == conf.unwrap_from_path('gc.float')
-    assert conf.find(bytype=ChoiceOption) == [conf.unwrap_from_path('gc.name'), conf.unwrap_from_path('objspace')]
-    assert conf.find_first(bytype=ChoiceOption) == conf.unwrap_from_path('gc.name')
-    assert conf.find(byvalue='ref') == [conf.unwrap_from_path('gc.name')]
-    assert conf.find_first(byvalue='ref') == conf.unwrap_from_path('gc.name')
-    assert conf.find(byname='prop') == [conf.unwrap_from_path('gc.prop')]
+    ret = conf.find(byname='dummy')
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.dummy'))
+    ret = conf.find(byname='float')
+    assert len(ret) == 2
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.float'))
+    _is_same_opt(ret[1], conf.unwrap_from_path('float'))
+    _is_same_opt(conf.find_first(byname='bool'), conf.unwrap_from_path('gc.gc2.bool'))
+    _is_same_opt(conf.find_first(byname='bool', byvalue=True), conf.unwrap_from_path('bool'))
+    _is_same_opt(conf.find_first(byname='dummy'), conf.unwrap_from_path('gc.dummy'))
+    _is_same_opt(conf.find_first(byname='float'), conf.unwrap_from_path('gc.float'))
+    ret = conf.find(bytype=ChoiceOption)
+    assert len(ret) == 2
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.name'))
+    _is_same_opt(ret[1], conf.unwrap_from_path('objspace'))
+    _is_same_opt(conf.find_first(bytype=ChoiceOption), conf.unwrap_from_path('gc.name'))
+    ret = conf.find(byvalue='ref')
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.name'))
+    _is_same_opt(conf.find_first(byvalue='ref'), conf.unwrap_from_path('gc.name'))
+    ret = conf.find(byname='prop')
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.prop'))
     conf.read_write()
     raises(AttributeError, "assert conf.find(byname='prop')")
-    assert conf.find(byname='prop', check_properties=False) == [conf.unwrap_from_path('gc.gc2.prop'), conf.unwrap_from_path('gc.prop')]
-    assert conf.find(byname='prop', force_permissive=True) == [conf.unwrap_from_path('gc.prop')]
-    assert conf.find_first(byname='prop', force_permissive=True) == conf.unwrap_from_path('gc.prop')
+    ret = conf.find(byname='prop', check_properties=False)
+    assert len(ret) == 2
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.gc2.prop'))
+    _is_same_opt(ret[1], conf.unwrap_from_path('gc.prop'))
+    ret = conf.find(byname='prop', force_permissive=True)
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.prop'))
+    _is_same_opt(conf.find_first(byname='prop', force_permissive=True), conf.unwrap_from_path('gc.prop'))
     #assert conf.find_first(byname='prop') == conf.unwrap_from_path('gc.prop')
     # combinaison of filters
-    assert conf.find(bytype=BoolOption, byname='dummy') == [conf.unwrap_from_path('gc.dummy')]
-    assert conf.find_first(bytype=BoolOption, byname='dummy') == conf.unwrap_from_path('gc.dummy')
-    assert conf.find(byvalue=False, byname='dummy') == [conf.unwrap_from_path('gc.dummy')]
-    assert conf.find_first(byvalue=False, byname='dummy') == conf.unwrap_from_path('gc.dummy')
+    ret = conf.find(bytype=BoolOption, byname='dummy')
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.dummy'))
+    _is_same_opt(conf.find_first(bytype=BoolOption, byname='dummy'), conf.unwrap_from_path('gc.dummy'))
+    ret = conf.find(byvalue=False, byname='dummy')
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.dummy'))
+    _is_same_opt(conf.find_first(byvalue=False, byname='dummy'), conf.unwrap_from_path('gc.dummy'))
     #subconfig
-    assert conf.gc.find(byname='dummy') == [conf.unwrap_from_path('gc.dummy')]
-    assert conf.gc.find(byname='float') == [conf.unwrap_from_path('gc.float')]
-    assert conf.gc.find(byname='bool') == [conf.unwrap_from_path('gc.gc2.bool')]
-    assert conf.gc.find_first(byname='bool', byvalue=False) == conf.unwrap_from_path('gc.gc2.bool')
+    ret = conf.gc.find(byname='dummy')
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.dummy'))
+    ret = conf.gc.find(byname='float')
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.float'))
+    ret = conf.gc.find(byname='bool')
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.gc2.bool'))
+    _is_same_opt(conf.gc.find_first(byname='bool', byvalue=False), conf.unwrap_from_path('gc.gc2.bool'))
     raises(AttributeError, "assert conf.gc.find_first(byname='bool', byvalue=True)")
     raises(AttributeError, "conf.gc.find(byname='wantref').first()")
-    assert conf.gc.find(byname='prop', check_properties=False) == [conf.unwrap_from_path('gc.gc2.prop'), conf.unwrap_from_path('gc.prop')]
+    ret = conf.gc.find(byname='prop', check_properties=False)
+    assert len(ret) == 2
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.gc2.prop'))
+    _is_same_opt(ret[1], conf.unwrap_from_path('gc.prop'))
     conf.read_only()
-    assert conf.gc.find(byname='prop') == [conf.unwrap_from_path('gc.prop')]
+    ret = conf.gc.find(byname='prop')
+    assert len(ret) == 1
+    _is_same_opt(ret[0], conf.unwrap_from_path('gc.prop'))
     # not OptionDescription
     raises(AttributeError, "conf.find_first(byname='gc')")
     raises(AttributeError, "conf.gc.find_first(byname='gc2')")
@@ -184,8 +223,10 @@ def test_find_multi():
     raises(AttributeError, "conf.find(byvalue=True)")
     raises(AttributeError, "conf.find_first(byvalue=True)")
     conf.bool.append(True)
-    assert conf.find(byvalue=True) == [b]
-    assert conf.find_first(byvalue=True) == b
+    ret = conf.find(byvalue=True)
+    assert len(ret) == 1
+    _is_same_opt(ret[0], b)
+    _is_same_opt(conf.find_first(byvalue=True), b)
 
 
 def test_does_not_find_in_config():

test/test_dereference.py

@@ -87,6 +87,8 @@ def test_deref_option_cache():
 
 
 def test_deref_optiondescription_cache():
+    if not IS_DEREFABLE:
+        return
     b = BoolOption('b', '')
     o = OptionDescription('od', '', [b])
     o.impl_build_cache_option()
@@ -113,6 +115,8 @@ def test_deref_option_config():
 
 
 def test_deref_optiondescription_config():
+    if not IS_DEREFABLE:
+        return
     b = BoolOption('b', '')
     o = OptionDescription('od', '', [b])
     c = Config(o)
@@ -126,6 +130,8 @@ def test_deref_optiondescription_config():
 
 
 def test_deref_groupconfig():
+    if not IS_DEREFABLE:
+        return
     i1 = IntOption('i1', '')
     od1 = OptionDescription('od1', '', [i1])
     od2 = OptionDescription('od2', '', [od1])
@@ -140,6 +146,8 @@ def test_deref_groupconfig():
 
 
 def test_deref_metaconfig():
+    if not IS_DEREFABLE:
+        return
     i1 = IntOption('i1', '')
     od1 = OptionDescription('od1', '', [i1])
     od2 = OptionDescription('od2', '', [od1])
@@ -154,6 +162,8 @@ def test_deref_metaconfig():
 
 
 def test_deref_submulti():
+    if not IS_DEREFABLE:
+        return
     multi = StrOption('multi', '', multi=submulti)
     od = OptionDescription('od', '', [multi])
     cfg = Config(od)

test/test_state.py

@@ -20,7 +20,7 @@ def return_value(value=None):
 def _get_slots(opt):
     slots = set()
     for subclass in opt.__class__.__mro__:
-        if subclass is not object:
+        if subclass is not object and '__slots__' in dir(subclass):
             slots.update(subclass.__slots__)
     return slots