[FIX] incorrect __exit__ calls in tests
bzr revid: xmo@openerp.com-20131015110814-faz7361z0560xgrm
This commit is contained in:
parent
e0493cd6d4
commit
38682f1fba
|
@ -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 = []
|
||||
|
|
|
@ -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 = []
|
||||
|
|
Loading…
Reference in New Issue