[MERGE]with trunk.

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

1 files changed, 4 insertions, 9 deletions

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 = []