summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-07-26 20:36:23 +0200
committerChristophe Simonis <chs@odoo.com>2017-07-26 20:36:23 +0200
commit3d4238f71e48de14afd0072a8309f2bb6fc46eb6 (patch)
treedf666a34ffce48141df57e29d3323d0be018b63f
parent4f501348c41f38befec5374e0e4b50b30c0e6989 (diff)
parent98d3a08ebb38e5943310b5bf8e3847f0afbba02e (diff)
[MERGE] forward port branch saas-16 up to 98d3a08ebb3
-rw-r--r--odoo/addons/base/tests/test_ir_actions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/odoo/addons/base/tests/test_ir_actions.py b/odoo/addons/base/tests/test_ir_actions.py
index c82a5403597..cb48752a960 100644
--- a/odoo/addons/base/tests/test_ir_actions.py
+++ b/odoo/addons/base/tests/test_ir_actions.py
@@ -251,14 +251,14 @@ class TestCustomFields(common.TransactionCase):
def test_create_unique(self):
""" one cannot create two fields with the same name on a given model """
self.create_field('x_foo')
- with self.assertRaises(IntegrityError):
+ with self.assertRaises(IntegrityError), mute_logger('odoo.sql_db'):
self.create_field('x_foo')
def test_rename_unique(self):
""" one cannot create two fields with the same name on a given model """
field1 = self.create_field('x_foo')
field2 = self.create_field('x_bar')
- with self.assertRaises(IntegrityError):
+ with self.assertRaises(IntegrityError), mute_logger('odoo.sql_db'):
field2.name = field1.name
def test_remove_without_view(self):