fix unit tests

bzr revid: nicolas.vanhoren@openerp.com-20130604160525-e0qgr814j2g6qhl6

addons/web/tests/test_dataset.py

@@ -2,30 +2,36 @@
 import mock
 import unittest2
 import openerp.addons.web.controllers.main
+from openerp.addons.web.http import request as req
+from openerp.addons.web.http import RequestProxy
 
 class TestDataSetController(unittest2.TestCase):
     def setUp(self):
         self.dataset = openerp.addons.web.controllers.main.DataSet()
-        self.request = mock.Mock()
-        self.read = self.request.session.model().read
-        self.search = self.request.session.model().search
+        self.tmp_req = RequestProxy.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 = []
 
         self.assertEqual(
-            self.dataset.do_search_read(self.request, 'fake.model'),
+            self.dataset.do_search_read('fake.model'),
             {'records': [], 'length': 0})
         self.read.assert_called_once_with(
-            [], False, self.request.context)
+            [], False, req.context)
 
     def test_regular_find(self):
         self.search.return_value = [1, 2, 3]
 
-        self.dataset.do_search_read(self.request, 'fake.model')
+        self.dataset.do_search_read('fake.model')
         self.read.assert_called_once_with(
-            [1, 2, 3], False,self.request.context)
+            [1, 2, 3], False, req.context)
 
     def test_ids_shortcut(self):
         self.search.return_value = [1, 2, 3]
@@ -36,6 +42,6 @@ class TestDataSetController(unittest2.TestCase):
         ]
 
         self.assertEqual(
-            self.dataset.do_search_read(self.request, 'fake.model', ['id']),
+            self.dataset.do_search_read('fake.model', ['id']),
             {'records': [{'id': 1}, {'id': 2}, {'id': 3}], 'length': 3})
         self.assertFalse(self.read.called)

addons/web/tests/test_menu.py

@@ -2,6 +2,8 @@
 import collections
 import mock
 import unittest2
+from openerp.addons.web.http import request as req
+from openerp.addons.web.http import RequestProxy
 
 from ..controllers import main
 
@@ -13,12 +15,13 @@ class Placeholder(object):
 class LoadTest(unittest2.TestCase):
     def setUp(self):
         self.menu = main.Menu()
-        self.request = mock.Mock()
+        self.tmp_req = RequestProxy.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)
         models = collections.defaultdict(mock.Mock)
-        model = self.request.session.model.side_effect = \
+        model = req.session.model.side_effect = \
             lambda model_name: models[model_name]
 
         self.MockMenus = model('ir.ui.menu')
@@ -28,7 +31,7 @@ class LoadTest(unittest2.TestCase):
         }]
 
     def tearDown(self):
-        del self.request
+        self.tmp_req.__exit__()
         del self.MockMenus
         del self.menu
 
@@ -36,11 +39,11 @@ class LoadTest(unittest2.TestCase):
         self.MockMenus.search.return_value = []
         self.MockMenus.read.return_value = []
 
-        root = self.menu.load(self.request)
+        root = self.menu.load()
 
         self.MockMenus.search.assert_called_with(
             [('parent_id','=', False)], 0, False, False,
-            self.request.context)
+            req.context)
 
         self.assertEqual(root['all_menu_ids'], [])
 
@@ -56,16 +59,16 @@ class LoadTest(unittest2.TestCase):
             {'id': 2, 'sequence': 3, 'parent_id': False},
         ]
 
-        root = self.menu.load(self.request)
+        root = self.menu.load()
 
         self.MockMenus.search.assert_called_with(
             [('id','child_of', [1, 2, 3])], 0, False, False,
-            self.request.context)
+            req.context)
 
         self.MockMenus.read.assert_called_with(
             [1, 2, 3], ['name', 'sequence', 'parent_id',
                         'action'],
-            self.request.context)
+            req.context)
 
         self.assertEqual(root['all_menu_ids'], [1, 2, 3])
 
@@ -95,11 +98,11 @@ class LoadTest(unittest2.TestCase):
                 {'id': 4, 'sequence': 2, 'parent_id': [2, '']},
             ])
 
-        root = self.menu.load(self.request)
+        root = self.menu.load()
 
         self.MockMenus.search.assert_called_with(
             [('id','child_of', [1])], 0, False, False,
-            self.request.context)
+            req.context)
 
         self.assertEqual(root['all_menu_ids'], [1, 2, 3, 4])