[MERGE] merged with main web

bzr revid: bde@tinyerp.com-20140304053849-wpvxs1ojl5jyjokt

1 files changed, 3 insertions, 10 deletions

diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py
index 0160f0f28cd..c99efed4294 100644
--- a/addons/web/controllers/testing.py
+++ b/addons/web/controllers/testing.py
@@ -52,7 +52,6 @@ TESTING = Template(u"""<!DOCTYPE html>
     <script src="/web/static/lib/qunit/qunit.js"></script>
 
     <script type="text/javascript">
-        var oe_db_info = ${db_info | n};
         // List of modules, each module is preceded by its dependencies
         var oe_all_dependencies = ${dependencies | n};
         QUnit.config.testTimeout = 5 * 60 * 1000;
@@ -89,7 +88,7 @@ TESTING = Template(u"""<!DOCTYPE html>
 class TestRunnerController(http.Controller):
 
     @http.route('/web/tests', type='http', auth="none")
-    def index(self, req, mod=None, **kwargs):
+    def index(self, mod=None, **kwargs):
         ms = module.get_modules()
         manifests = dict(
             (name, desc)
@@ -114,7 +113,7 @@ class TestRunnerController(http.Controller):
         to_test = sorted_mods
         if mod != '*':
             if mod not in manifests:
-                return req.not_found(NOTFOUND.render(module=mod))
+                return request.not_found(NOTFOUND.render(module=mod))
             idx = sorted_mods.index(mod)
             to_test = [None] * len(sorted_mods)
             to_test[idx] = mod
@@ -134,16 +133,10 @@ class TestRunnerController(http.Controller):
             for mod, tests in itertools.izip(sorted_mods, tests)
         ]
 
-        # if all three db_info parameters are present, send them to the page
-        db_info = dict((k, v) for k, v in kwargs.iteritems()
-                       if k in ['source', 'supadmin', 'password'])
-        if len(db_info) != 3:
-            db_info = None
-
         return TESTING.render(files=files, dependencies=json.dumps(
             [name for name in sorted_mods
              if module.get_module_resource(name, 'static')
-             if manifests[name]['js']]), db_info=json.dumps(db_info))
+             if manifests[name]['js']]))
 
     def load_manifest(self, name):
         manifest = module.load_information_from_description_file(name)