diff options
Diffstat (limited to 'addons/test_mail/tests/test_mail_channel.py')
| -rw-r--r-- | addons/test_mail/tests/test_mail_channel.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/addons/test_mail/tests/test_mail_channel.py b/addons/test_mail/tests/test_mail_channel.py index 3fb07f010ce..cb9d949c7ef 100644 --- a/addons/test_mail/tests/test_mail_channel.py +++ b/addons/test_mail/tests/test_mail_channel.py @@ -4,7 +4,7 @@ from odoo.tests import tagged from odoo.addons.mail.tests.common import mail_new_test_user from odoo.addons.test_mail.tests.common import TestMailCommon -from odoo.exceptions import AccessError, except_orm, ValidationError, UserError +from odoo.exceptions import AccessError, ValidationError, UserError from odoo.tools import mute_logger, formataddr @@ -39,10 +39,7 @@ class TestChannelAccessRights(TestMailCommon): self.group_public.with_user(self.user_public).read() # Read Pigs -> ko, restricted to employees - # TODO: Change the except_orm to Warning ( Because here it's call check_access_rule - # which still generate exception in except_orm.So we need to change all - # except_orm to warning in mail module.) - with self.assertRaises(except_orm): + with self.assertRaises(AccessError): self.group_pigs.with_user(self.user_public).read() # Read a private group when being a member: ok @@ -64,7 +61,6 @@ class TestChannelAccessRights(TestMailCommon): @mute_logger('odoo.addons.base.models.ir_model', 'odoo.models', 'odoo.models.unlink') def test_access_rights_groups(self): # Employee read employee-based group: ok - # TODO Change the except_orm to Warning self.group_pigs.with_user(self.user_employee).read() # Employee can create a group @@ -77,7 +73,7 @@ class TestChannelAccessRights(TestMailCommon): self.group_pigs.with_user(self.user_employee).unlink() # Employee cannot read a private group - with self.assertRaises(except_orm): + with self.assertRaises(AccessError): self.group_private.with_user(self.user_employee).read() # Employee cannot write on private |