[MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_...

[odoo/odoo.git] / addons / web / tests / test_dataset.py

diff --git a/addons/web/tests/test_dataset.py b/addons/web/tests/test_dataset.py
index 778f23a..db75703 100644 (file)
--- a/addons/web/tests/test_dataset.py
+++ b/addons/web/tests/test_dataset.py
@@ -2,23 +2,29 @@
 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 set_request
 
 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 = 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]
@@ -28,9 +34,9 @@ class TestDataSetController(unittest2.TestCase):
             {'id': 3, 'name': 'qux'}
         ]
 
-        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]
@@ -41,6 +47,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)