From fc9bf8716a91e01a40dbcd93e2177672d4aeefc7 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 8 Apr 2010 19:23:33 +0200
Subject: [PATCH] [FIX] Ensure a failing test do not stop the server unless it
 has ERROR severity/level. [FIX] Load tests only if demo data are present.

bzr revid: jth@openerp.com-20100408172333-1g3g4nfy6m81m4zw
---
 bin/addons/__init__.py | 3 +--
 bin/tools/config.py    | 2 +-
 bin/tools/yaml_tag.py  | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 4dd62f11694..60850c16ff8 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -724,8 +724,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
                 load_demo_xml(cr, m, idref, mode)
                 load_demo(cr, m, idref, mode)                    
                 cr.execute('update ir_module_module set demo=%s where id=%s', (True, mid))
-            
-            load_test(cr, m, idref, mode)
+                load_test(cr, m, idref, mode)
             
             package_todo.append(package.name)
 
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 670c20af1af..18e9f61373e 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -77,7 +77,7 @@ class configmanager(object):
             'secure' : False,
             'syslog' : False,
             'log_level': logging.INFO,
-            'assert_exit_level': logging.WARNING, # level above which a failed assert will be raised
+            'assert_exit_level': logging.ERROR, # level above which a failed assert will be raised
             'cache_timeout': 100000,
             'login_message': False,
             'list_db' : True,
diff --git a/bin/tools/yaml_tag.py b/bin/tools/yaml_tag.py
index 97b29db1ac0..cdc892d9b80 100644
--- a/bin/tools/yaml_tag.py
+++ b/bin/tools/yaml_tag.py
@@ -15,7 +15,7 @@ class YamlTag(object):
         return "<%s %s>" % (self.__class__.__name__, sorted(self.__dict__.items()))
 
 class Assert(YamlTag):
-    def __init__(self, model, id, severity=logging.ERROR, string="NONAME", **kwargs):
+    def __init__(self, model, id, severity=logging.WARNING, string="NONAME", **kwargs):
         self.model = model
         self.id = id
         self.severity = severity
@@ -29,7 +29,7 @@ class Record(YamlTag):
         super(Record, self).__init__(**kwargs)
     
 class Python(YamlTag):
-    def __init__(self, model, severity=logging.ERROR, name="", **kwargs):
+    def __init__(self, model, severity=logging.WARNING, name="", **kwargs):
         self.model= model
         self.severity = severity
         self.name = name