[MERGE] upstream

bzr revid: fme@openerp.com-20130807100643-0olinq3584kzc3we

1 files changed, 10 insertions, 0 deletions

diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py
index 36afbd1e653..b51b12fc53d 100644
--- a/addons/web/controllers/testing.py
+++ b/addons/web/controllers/testing.py
@@ -13,6 +13,8 @@ from openerp.modules import module
 from .main import module_topological_sort
 from .. import http
 
+from ..http import request
+
 NOMODULE_TEMPLATE = Template(u"""<!DOCTYPE html>
 <html>
     <head>
@@ -162,3 +164,11 @@ class TestRunnerController(http.Controller):
             for path in glob.glob(normalized_pattern):
                 # replace OS path separators (from join & normpath) by URI ones
                 yield path[len(root):].replace(os.path.sep, '/')
+
+    @http.route('/web/tests/set_session_value', type='json', auth="none")
+    def set_session_value(self, value):
+        request.session.some_test_value = value
+
+    @http.route('/web/tests/get_session_value', type='json', auth="none")
+    def get_session_value(self):
+        return request.session.some_test_value
\ No newline at end of file