[MERGE] forward port of branch 8.0 up to 2e092ac

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

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 2189cc6..9d10e29 100644 (file)
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -862,10 +862,11 @@ def preload_registries(dbnames):
             # run test_file if provided
             if test_file:
                 _logger.info('loading test file %s', test_file)
-                if test_file.endswith('yml'):
-                    load_test_file_yml(registry, test_file)
-                elif test_file.endswith('py'):
-                    load_test_file_py(registry, test_file)
+                with openerp.api.Environment.manage():
+                    if test_file.endswith('yml'):
+                        load_test_file_yml(registry, test_file)
+                    elif test_file.endswith('py'):
+                        load_test_file_py(registry, test_file)
 
             if registry._assertion_report.failures:
                 rc += 1