[MERGE]with trunk.

bzr revid: ima@tinyerp.com-20131021124222-7j3xc1ahtek5gyuw

4 files changed, 29 insertions, 15 deletions

diff --git a/addons/web/tests/common.py b/addons/web/tests/common.py
new file mode 100644
index 00000000000..f95bbbd42e1
--- /dev/null
+++ b/addons/web/tests/common.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+import unittest2
+
+import mock
+
+from openerp.addons.web import http
+
+class MockRequestCase(unittest2.TestCase):
+    def setUp(self):
+        super(MockRequestCase, self).setUp()
+        self.tmp_req = http.set_request(mock.Mock())
+        self.tmp_req.__enter__()
+
+    def tearDown(self):
+        self.tmp_req.__exit__(None, None, None)
+        super(MockRequestCase, self).tearDown()
+
diff --git a/addons/web/tests/qunitsuite/suite.py b/addons/web/tests/qunitsuite/suite.py
index 7f0a0cb4976..3aed7b133f1 100644
--- a/addons/web/tests/qunitsuite/suite.py
+++ b/addons/web/tests/qunitsuite/suite.py
@@ -91,7 +91,7 @@ class QUnitSuite(unittest.TestSuite):
             return True
 
         elif event_name == 'qunit.moduleStart':
-            self._module = args[1].encode('utf-8')
+            self._module = args[1].encode('utf-8') if args[1] else ''
         elif event_name == 'qunit.moduleStop':
             self._test = None
             self._module = None
diff --git a/addons/web/tests/test_dataset.py b/addons/web/tests/test_dataset.py
index 98c2f95447c..f017e5f609a 100644
--- a/addons/web/tests/test_dataset.py
+++ b/addons/web/tests/test_dataset.py
@@ -1,21 +1,16 @@
 # -*- coding: utf-8 -*-
-import mock
-import unittest2
+from . import common
+
 import openerp.addons.web.controllers.main
 from openerp.addons.web.http import request as req
-from openerp.addons.web.http import set_request
 
-class TestDataSetController(unittest2.TestCase):
+class TestDataSetController(common.MockRequestCase):
     def setUp(self):
+        super(TestDataSetController, self).setUp()
         self.dataset = openerp.addons.web.controllers.main.DataSet()
-        self.tmp_req = set_request(mock.Mock())
-        self.tmp_req.__enter__()
         self.read = req.session.model().read
         self.search = req.session.model().search
 
-    def tearDown(self):
-        self.tmp_req.__exit__()
-
     def test_empty_find(self):
         self.search.return_value = []
         self.read.return_value = []
diff --git a/addons/web/tests/test_menu.py b/addons/web/tests/test_menu.py
index 6c86efe2fc6..8e8f3900670 100644
--- a/addons/web/tests/test_menu.py
+++ b/addons/web/tests/test_menu.py
@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 import collections
+
 import mock
 import unittest2
+
 from openerp.addons.web.http import request as req
-from openerp.addons.web.http import set_request
+
+from . import common
 
 from ..controllers import main
 
@@ -12,11 +15,10 @@ class Placeholder(object):
         for k, v in kwargs.iteritems():
             setattr(self, k, v)
 
-class LoadTest(unittest2.TestCase):
+class LoadTest(common.MockRequestCase):
     def setUp(self):
+        super(LoadTest, self).setUp()
         self.menu = main.Menu()
-        self.tmp_req = set_request(mock.Mock())
-        self.tmp_req.__enter__()
 
         # Have self.request.session.model() return a different mock object for
         # each model (but always the same mock for a given model name)
@@ -31,9 +33,9 @@ class LoadTest(unittest2.TestCase):
         }]
 
     def tearDown(self):
-        self.tmp_req.__exit__()
         del self.MockMenus
         del self.menu
+        super(LoadTest, self).tearDown()
 
     def test_empty(self):
         self.MockMenus.search.return_value = []