From 38682f1fbace9d486a3a0ab113d932b0dc247b67 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 15 Oct 2013 13:08:14 +0200 Subject: [FIX] incorrect __exit__ calls in tests bzr revid: xmo@openerp.com-20131015110814-faz7361z0560xgrm --- addons/web/tests/test_menu.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'addons/web/tests/test_menu.py') diff --git a/addons/web/tests/test_menu.py b/addons/web/tests/test_menu.py index 6c86efe2fc6..8e8f3900670 100644 --- a/addons/web/tests/test_menu.py +++ b/addons/web/tests/test_menu.py @@ -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 = [] -- cgit v1.2.3