[FIX] [TESTS] mail, portal: fixed tests, because the error raised by the OROM has changed in some cases.

bzr revid: tde@openerp.com-20131206121432-mz2jpj535tmcmftl

3 files changed, 12 insertions, 9 deletions

diff --git a/addons/mail/tests/test_mail_group.py b/addons/mail/tests/test_mail_group.py
index c1512441b13..34c7f0c00e0 100644
--- a/addons/mail/tests/test_mail_group.py
+++ b/addons/mail/tests/test_mail_group.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.addons.mail.tests.common import TestMail
+from openerp.exceptions import AccessError
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
@@ -40,7 +41,7 @@ class TestMailGroup(TestMail):
         self.mail_group.read(cr, user_employee_id, [self.group_pigs_id])
 
         # Do: Bert creates a group -> ko, no access rights
-        with self.assertRaises(except_orm):
+        with self.assertRaises(AccessError):
             self.mail_group.create(cr, user_noone_id, {'name': 'Test'})
         # Do: Raoul creates a restricted group -> ok
         new_group_id = self.mail_group.create(cr, user_employee_id, {'name': 'Test'})
@@ -58,7 +59,7 @@ class TestMailGroup(TestMail):
         # Do: Raoul write on Jobs -> ok
         self.mail_group.write(cr, user_employee_id, [self.group_priv_id], {'name': 'modified'})
         # Do: Bert cannot write on Private -> ko (read but no write)
-        with self.assertRaises(except_orm):
+        with self.assertRaises(AccessError):
             self.mail_group.write(cr, user_noone_id, [self.group_priv_id], {'name': 're-modified'})
         # Test: Bert cannot unlink the group
         with self.assertRaises(except_orm):
diff --git a/addons/mail/tests/test_mail_message.py b/addons/mail/tests/test_mail_message.py
index 5dc5e9e247d..180661a0707 100644
--- a/addons/mail/tests/test_mail_message.py
+++ b/addons/mail/tests/test_mail_message.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.addons.mail.tests.common import TestMail
+from openerp.exceptions import AccessError
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
@@ -258,13 +259,13 @@ class TestMailMessage(TestMail):
         # ----------------------------------------
 
         # Do: Bert creates a message on Pigs -> ko, no creation rights
-        self.assertRaises(except_orm, self.mail_message.create,
+        self.assertRaises(AccessError, self.mail_message.create,
             cr, user_bert_id, {'model': 'mail.group', 'res_id': self.group_pigs_id, 'body': 'Test'})
         # Do: Bert create a message on Jobs -> ko, no creation rights
-        self.assertRaises(except_orm, self.mail_message.create,
+        self.assertRaises(AccessError, self.mail_message.create,
             cr, user_bert_id, {'model': 'mail.group', 'res_id': self.group_jobs_id, 'body': 'Test'})
         # Do: Bert create a private message -> ko, no creation rights
-        self.assertRaises(except_orm, self.mail_message.create,
+        self.assertRaises(AccessError, self.mail_message.create,
             cr, user_bert_id, {'body': 'Test'})
 
         # Do: Raoul creates a message on Jobs -> ok, write access to the related document
@@ -410,15 +411,15 @@ class TestMailMessage(TestMail):
         for message in bert_jobs.message_ids:
             trigger_read = message.subject
         for partner in bert_jobs.message_follower_ids:
-            with self.assertRaises(except_orm):
+            with self.assertRaises(AccessError):
                 trigger_read = partner.name
         # Do: Bert comments Jobs, ko because no creation right
-        self.assertRaises(except_orm,
+        self.assertRaises(AccessError,
                           self.mail_group.message_post,
                           cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
 
         # Do: Bert writes on its own profile, ko because no message create access
-        with self.assertRaises(except_orm):
+        with self.assertRaises(AccessError):
             self.res_users.message_post(cr, user_bert_id, user_bert_id, body='I love Bert')
             self.res_partner.message_post(cr, user_bert_id, partner_bert_id, body='I love Bert')
 
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 30e3004be0b..66cb0958774 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.addons.mail.tests.common import TestMail
+from openerp.exceptions import AccessError
 from openerp.osv.orm import except_orm
 from openerp.tools.misc import mute_logger
 
@@ -63,7 +64,7 @@ class test_portal(TestMail):
             trigger_read = chell_pigs.name
 
         # Do: Chell posts a message on Pigs, crash because can not write on group or is not in the followers
-        with self.assertRaises(except_orm):
+        with self.assertRaises(AccessError):
             self.mail_group.message_post(cr, self.user_chell_id, self.group_pigs_id, body='Message')
 
         # Do: Chell is added into Pigs followers and browse it -> ok for messages, ko for partners (no read permission)