summaryrefslogtreecommitdiff
path: root/openerp/modules/loading.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-12-10 13:05:58 +0100
committerChristophe Simonis <chs@odoo.com>2015-12-10 13:05:58 +0100
commit82a495eed52a9f42e5b88caa52c20a85f8d81ce3 (patch)
tree6c5e8cc0247d5fe08d24e9abae38fe353fbebc56 /openerp/modules/loading.py
parent0bc2ddae784bf80c4c809d8b7f6d642d576f92a1 (diff)
parent4022493c0b85f966e499b6c03ac7cce5556f15e6 (diff)
[MERGE] forward port of branch saas-7 up to 4022493
Diffstat (limited to 'openerp/modules/loading.py')
-rw-r--r--openerp/modules/loading.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index cd9fa9ce474..85f49b1ea06 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -182,9 +182,9 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
report.record_result(load_test(module_name, idref, mode))
# Python tests
ir_http = registry['ir.http']
- # Force routing map to be rebuilt between each module test suite
- vars(ir_http).pop('routing_map', None)
-
+ if hasattr(ir_http, '_routing_map'):
+ # Force routing map to be rebuilt between each module test suite
+ del(ir_http._routing_map)
report.record_result(openerp.modules.module.run_unit_tests(module_name, cr.dbname))
processed_modules.append(package.name)