diff options
| author | Julien Thewys <jth@openerp.com> | 2010-11-17 13:39:28 +0100 |
|---|---|---|
| committer | Julien Thewys <jth@openerp.com> | 2010-11-17 13:39:28 +0100 |
| commit | c9c2f03a8ccdedf1bdd77554fb1f01db1d818ccd (patch) | |
| tree | 4b6a5599472c42e765ba8417672ecffd2a77eb92 /bin | |
| parent | 04c3beb9cbd8116690a0a0912d725cd41c80e3ac (diff) | |
[REM] Removed wrongly committed changes (wrong branch name).
bzr revid: jth@openerp.com-20101117123928-vi70mnhlt9nz8cfc
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/addons/__init__.py | 7 | ||||
| -rw-r--r-- | bin/tools/config.py | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py index e4fabab416e..0b5c6dc09c5 100644 --- a/bin/addons/__init__.py +++ b/bin/addons/__init__.py @@ -733,9 +733,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs): 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) - elif tools.config.options['test_force']: - # forces test loading without demo data (useful when updating modules) + # launch tests only in demo mode, as most tests will depend + # on demo data. Other tests can be added into the regular + # 'data' section, but should probably not alter the data, + # as there is no rollback. load_test(cr, m, idref, mode) package_todo.append(package.name) diff --git a/bin/tools/config.py b/bin/tools/config.py index fd1d8c41cba..f98cdbab1b9 100644 --- a/bin/tools/config.py +++ b/bin/tools/config.py @@ -85,7 +85,6 @@ class configmanager(object): 'test_file' : False, 'test_report_directory' : False, 'test_disable' : False, - 'test_force' : False, 'test_commit' : False, 'static_http_enable': False, 'static_http_document_root': None, @@ -163,8 +162,6 @@ class configmanager(object): group.add_option("--test-report-directory", dest="test_report_directory", help="If set, will save sample of all reports in this directory.") group.add_option("--test-disable", action="store_true", dest="test_disable", default=False, help="Disable loading test files.") - group.add_option("--force-test", action="store_true", dest="test_force", - default=False, help="Forces loading of test files (even if --without-demo).") group.add_option("--test-commit", action="store_true", dest="test_commit", default=False, help="Commit database changes performed by tests.") parser.add_option_group(group) @@ -288,7 +285,7 @@ class configmanager(object): 'language', 'translate_out', 'translate_in', 'debug_mode', 'smtp_ssl', 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', 'list_db', 'xmlrpcs', - 'test_file', 'test_disable', 'test_force', 'test_commit', 'test_report_directory' + 'test_file', 'test_disable', 'test_commit', 'test_report_directory' ] for arg in keys: |