[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524...

[odoo/odoo.git] / openerp / cli / server.py

diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 6c8af9f..da46192 100644 (file)
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -107,8 +107,15 @@ def run_test_file(dbname, test_file):
         registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=config['init'] or config['update'])
         cr = registry.db.cursor()
         _logger.info('loading test file %s', test_file)
-        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
-        cr.rollback()
+        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'init')
+
+        if config['test_commit']:
+            _logger.info('test %s has been commited', test_file)
+            cr.commit()
+        else:
+            _logger.info('test %s has been rollbacked', test_file)
+            cr.rollback()
+
         cr.close()
     except Exception:
         _logger.exception('Failed to initialize database `%s` and run test file `%s`.', dbname, test_file)