Merge branch 'master' into orm

[tiramisu.git] / test / test_config_api.py

diff --git a/test/test_config_api.py b/test/test_config_api.py
index f5bc2c1..f76895a 100644 (file)
--- a/test/test_config_api.py
+++ b/test/test_config_api.py
@@ -33,28 +33,29 @@ def make_description():
     return descr
 
 
-def test_compare_configs():
-    "config object comparison"
-    descr = make_description()
-    conf1 = Config(descr)
-    conf2 = Config(descr)
-    conf2.wantref = True
-    assert conf1 != conf2
-    assert hash(conf1) != hash(conf2)
-    #assert conf1.getkey() != conf2.getkey()
-    conf1.wantref = True
-    assert conf1 == conf2
-    assert hash(conf1) == hash(conf2)
-    #assert conf1.getkey() == conf2.getkey()
-    conf2.gc.dummy = True
-    assert conf1 != conf2
-    assert hash(conf1) != hash(conf2)
-    #assert conf1.getkey() != conf2.getkey()
-    conf1.gc.dummy = True
-    assert conf1 == conf2
-    assert hash(conf1) == hash(conf2)
-    assert not conf1 == 'conf2'
-    assert conf1 != 'conf2'
+#FIXME
+#def test_compare_configs():
+#    "config object comparison"
+#    descr = make_description()
+#    conf1 = Config(descr)
+#    conf2 = Config(descr)
+#    conf2.wantref = True
+#    assert conf1 != conf2
+#    assert hash(conf1) != hash(conf2)
+#    #assert conf1.getkey() != conf2.getkey()
+#    conf1.wantref = True
+#    assert conf1 == conf2
+#    assert hash(conf1) == hash(conf2)
+#    #assert conf1.getkey() == conf2.getkey()
+#    conf2.gc.dummy = True
+#    assert conf1 != conf2
+#    assert hash(conf1) != hash(conf2)
+#    #assert conf1.getkey() != conf2.getkey()
+#    conf1.gc.dummy = True
+#    assert conf1 == conf2
+#    assert hash(conf1) == hash(conf2)
+#    assert not conf1 == 'conf2'
+#    assert conf1 != 'conf2'
 # ____________________________________________________________
 
 
@@ -131,8 +132,7 @@ def test_find_in_config():
     assert conf.find(byname='prop') == [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_first(byname='prop') == conf.unwrap_from_path('gc.prop')
+    assert conf.find(byname='prop', check_properties=False) == [conf.unwrap_from_path('gc.prop'), conf.unwrap_from_path('gc.gc2.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')
@@ -145,7 +145,7 @@ def test_find_in_config():
     assert 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')]
+    assert conf.gc.find(byname='prop', check_properties=False) == [conf.unwrap_from_path('gc.prop'), conf.unwrap_from_path('gc.gc2.prop')]
     conf.read_only()
     assert conf.gc.find(byname='prop') == [conf.unwrap_from_path('gc.prop')]
     # not OptionDescription