diff options
Diffstat (limited to 'addons/test_mail')
| -rw-r--r-- | addons/test_mail/tests/test_mail_channel.py | 10 | ||||
| -rw-r--r-- | addons/test_mail/tests/test_mail_message.py | 18 |
2 files changed, 10 insertions, 18 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 diff --git a/addons/test_mail/tests/test_mail_message.py b/addons/test_mail/tests/test_mail_message.py index 1487597f56a..42c48aa960f 100644 --- a/addons/test_mail/tests/test_mail_message.py +++ b/addons/test_mail/tests/test_mail_message.py @@ -7,7 +7,7 @@ from unittest.mock import patch from odoo.addons.mail.tests.common import mail_new_test_user from odoo.addons.test_mail.tests.common import TestMailCommon from odoo.addons.test_mail.models.test_mail_models import MailTestSimple -from odoo.exceptions import AccessError, except_orm +from odoo.exceptions import AccessError from odoo.tools import mute_logger, formataddr from odoo.tests import tagged @@ -244,15 +244,12 @@ class TestMessageAccess(TestMailCommon): @mute_logger('odoo.addons.base.models.ir_model', 'odoo.models') def test_mail_message_access_read_crash(self): - # 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.message.with_user(self.user_employee).read() @mute_logger('odoo.models') def test_mail_message_access_read_crash_portal(self): - with self.assertRaises(except_orm): + with self.assertRaises(AccessError): self.message.with_user(self.user_portal).read(['body', 'message_type', 'subtype_id']) def test_mail_message_access_read_ok_portal(self): @@ -302,17 +299,16 @@ class TestMessageAccess(TestMailCommon): @mute_logger('odoo.models') def test_mail_message_access_create_crash(self): # Do: Bert create a private message -> ko, no creation rights - with self.assertRaises(except_orm): + with self.assertRaises(AccessError): self.env['mail.message'].with_user(self.user_employee).create({'model': 'mail.channel', 'res_id': self.group_private.id, 'body': 'Test'}) @mute_logger('odoo.models') def test_mail_message_access_create_doc(self): - # TODO Change the except_orm to Warning Message = self.env['mail.message'].with_user(self.user_employee) # Do: Raoul creates a message on Jobs -> ok, write access to the related document Message.create({'model': 'mail.channel', 'res_id': self.group_public.id, 'body': 'Test'}) # Do: Raoul creates a message on Priv -> ko, no write access to the related document - with self.assertRaises(except_orm): + with self.assertRaises(AccessError): Message.create({'model': 'mail.channel', 'res_id': self.group_private.id, 'body': 'Test'}) def test_mail_message_access_create_private(self): @@ -338,11 +334,11 @@ class TestMessageAccess(TestMailCommon): body='<p>This is First Message</p>', subject='Subject', message_type='comment', subtype_xmlid='mail.mt_note') # portal user have no rights to read the message - with self.assertRaises(except_orm): + with self.assertRaises(AccessError): message.with_user(self.user_portal).read(['subject, body']) with patch.object(MailTestSimple, 'check_access_rights', return_value=True): - with self.assertRaises(except_orm): + with self.assertRaises(AccessError): message.with_user(self.user_portal).read(['subject, body']) # parent message is accessible to references notification mail values |