[MERGE] from trunk

bzr revid: rco@openerp.com-20121105083756-jdr9fxp32djpifqk

diff --cc openerp/tests/__init__.py
index c907d56,aa39b77..c4b77a6
--- 1/openerp/tests/__init__.py
--- 2/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@@ -9,7 -9,7 +9,7 @@@ See the :ref:`test-framework` section i
  """
  
  from . import test_expression, test_html_sanitize, test_ir_sequence, test_orm,\
-               test_fields, test_per_class_teardown, \
 -              test_basecase, \
++              test_fields, test_basecase, \
                test_view_validation, test_uninstall, test_misc, test_db_cursor
  
  fast_suite = [
@@@ -21,8 -21,7 +21,8 @@@ checks = 
      test_html_sanitize,
      test_db_cursor,
      test_orm,
 +    test_fields,
-     test_per_class_teardown,
+     test_basecase,
      test_view_validation,
      test_misc,
  ]