summaryrefslogtreecommitdiff
path: root/addons/web/tests
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2014-09-05 15:28:22 +0200
committerChristophe Simonis <chs@odoo.com>2014-09-05 15:28:22 +0200
commit31bf30d2d0eb78baaa36360b99fe58bf7cd4c9e7 (patch)
treed7be61ecd6bb4c8b5552e39b03e2a64eebbbf323 /addons/web/tests
parentafba9e8817c458640ae446ac7aaaab79be4fe1e9 (diff)
parented1c173971968eaa96693cb4e1547efa6e6c34e0 (diff)
[MERGE] forward port of branch 8.0 up to ed1c173
Diffstat (limited to 'addons/web/tests')
-rw-r--r--addons/web/tests/test_serving_base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/tests/test_serving_base.py b/addons/web/tests/test_serving_base.py
index 34cc7e10b62..10545a3efb4 100644
--- a/addons/web/tests/test_serving_base.py
+++ b/addons/web/tests/test_serving_base.py
@@ -3,7 +3,7 @@
import random
import unittest2
-from ..controllers.main import module_topological_sort as sort
+from openerp.tools import topological_sort
def sample(population):
return random.sample(
@@ -22,7 +22,7 @@ class TestModulesLoading(unittest2.TestCase):
ms = dict(modules)
seen = set()
- sorted_modules = sort(ms)
+ sorted_modules = topological_sort(ms)
for module in sorted_modules:
deps = ms[module]
self.assertGreaterEqual(