[REV] revert of previous improvement

bzr revid: nicolas.vanhoren@openerp.com-20130605092926-dhoumh76dwtl211t

1 files changed, 8 insertions, 14 deletions

diff --git a/addons/web/tests/test_dataset.py b/addons/web/tests/test_dataset.py
index 72cd99a259b..a6faf9e6df1 100644
--- a/addons/web/tests/test_dataset.py
+++ b/addons/web/tests/test_dataset.py
@@ -2,36 +2,30 @@
 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.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__()
+        self.request = mock.Mock()
+        self.read = self.request.session.model().read
+        self.search = self.request.session.model().search
 
     def test_empty_find(self):
         self.search.return_value = []
         self.read.return_value = []
 
         self.assertEqual(
-            self.dataset.do_search_read('fake.model'),
+            self.dataset.do_search_read(self.request, 'fake.model'),
             {'records': [], 'length': 0})
         self.read.assert_called_once_with(
-            [], False, req.context)
+            [], False, self.request.context)
 
     def test_regular_find(self):
         self.search.return_value = [1, 2, 3]
 
-        self.dataset.do_search_read('fake.model')
+        self.dataset.do_search_read(self.request, 'fake.model')
         self.read.assert_called_once_with(
-            [1, 2, 3], False, req.context)
+            [1, 2, 3], False,self.request.context)
 
     def test_ids_shortcut(self):
         self.search.return_value = [1, 2, 3]
@@ -42,6 +36,6 @@ class TestDataSetController(unittest2.TestCase):
         ]
 
         self.assertEqual(
-            self.dataset.do_search_read('fake.model', ['id']),
+            self.dataset.do_search_read(self.request, 'fake.model', ['id']),
             {'records': [{'id': 1}, {'id': 2}, {'id': 3}], 'length': 3})
         self.assertFalse(self.read.called)