summaryrefslogtreecommitdiff
path: root/bin/addons/__init__.py
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2010-05-19 17:30:27 +0200
committerOlivier Dony <odo@openerp.com>2010-05-19 17:30:27 +0200
commit73b5ab1b242cdc8371cf7e95995c148bbe1add7f (patch)
tree7d291c8f70eefd29be149ed7e6f5e17c3de927ca /bin/addons/__init__.py
parentebd97446d3fb0d9f1bc72474a7003719fbeed912 (diff)
[IMP] renamed server option --test-no-rollback to --test-commit, and dropped --test-continue, making it the default
bzr revid: odo@openerp.com-20100519153027-trhfaluudgo4f59z
Diffstat (limited to 'bin/addons/__init__.py')
-rw-r--r--bin/addons/__init__.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 82761d647bd..e0073d3f123 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -644,16 +644,13 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
try:
_load_data(cr, module_name, id_map, mode, 'test')
except Exception, e:
- if tools.config.options['test-continue']:
- logger.notifyChannel('ERROR', netsvc.LOG_TEST, e)
- pass
- else:
- raise
+ logger.notifyChannel('ERROR', netsvc.LOG_TEST, e)
+ pass
finally:
- if tools.config.options['test-rollback']:
- cr.rollback()
- else:
+ if tools.config.options['test-commit']:
cr.commit()
+ else:
+ cr.rollback()
def _load_data(cr, module_name, id_map, mode, kind):
noupdate = (kind == 'demo')