From 102031798e2a4035319adde02d6e393d7ee759fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 30 Oct 2014 11:06:05 +0100 Subject: [PATCH] [FIX] account_journal_period_close: fix the test suite for 7.0 --- .../tests/test_account_journal_period_close.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/account_journal_period_close/tests/test_account_journal_period_close.py b/account_journal_period_close/tests/test_account_journal_period_close.py index 8b48bac27..fe93d013e 100644 --- a/account_journal_period_close/tests/test_account_journal_period_close.py +++ b/account_journal_period_close/tests/test_account_journal_period_close.py @@ -28,7 +28,7 @@ # import openerp.tests.common as common -from openerp.osv import orm +from openerp.osv import orm, osv from datetime import datetime from psycopg2 import IntegrityError @@ -138,7 +138,7 @@ class TestAccountJournalPeriodClose(common.TransactionCase): journal_id) # I check if the exception is correctly raised at create of an account # move which is linked with a closed journal - self.assertRaises(orm.except_orm, + self.assertRaises(osv.except_osv, self.registry('account.move').create, self.cr, self.uid, move_values, context=context) @@ -204,6 +204,9 @@ class TestAccountJournalPeriodClose(common.TransactionCase): # I check if the exception is correctly raised at adding both same # journal on a period self.cr._default_log_exceptions = False - self.assertRaises(IntegrityError, - create_journal_period, - self, period_id, journal_id, context) + try: + self.assertRaises(IntegrityError, + create_journal_period, + self, period_id, journal_id, context) + finally: + self.cr._default_log_exceptions = True