From 9d3a5ec72acbdfda81f95b434d6444563a5cd34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 19 May 2015 13:53:43 +0200 Subject: [PATCH] [IMP][FIX] mail: tests: updated mute loggers (moved files) + added loggers were necessary. --- addons/mail/tests/test_invite.py | 2 +- addons/mail/tests/test_mail_features.py | 26 ++++++++-------- addons/mail/tests/test_mail_gateway.py | 40 ++++++++++++------------- addons/mail/tests/test_mail_message.py | 4 ++- addons/mail/tests/test_mail_template.py | 4 +-- addons/mail/tests/test_message_read.py | 2 +- addons/portal/tests/test_portal.py | 4 +-- 7 files changed, 42 insertions(+), 40 deletions(-) diff --git a/addons/mail/tests/test_invite.py b/addons/mail/tests/test_invite.py index 5daa6ea784c..364b62e7270 100644 --- a/addons/mail/tests/test_invite.py +++ b/addons/mail/tests/test_invite.py @@ -6,7 +6,7 @@ from openerp.tools import mute_logger class TestInvite(TestMail): - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_invite_email(self): mail_invite = self.env['mail.wizard.invite'].with_context({ 'default_res_model': 'mail.group', diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py index 90af3b40a2b..7642af47fea 100644 --- a/addons/mail/tests/test_mail_features.py +++ b/addons/mail/tests/test_mail_features.py @@ -89,7 +89,7 @@ class TestMailFeatures(TestMail): 'URL redirection: action with message_id for read-accredited user should redirect to Pigs' ) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_inbox_redirection_message_document(self): """ Inbox redirection: message + read access: Doc """ message = self.group_pigs.message_post(body='My body', partner_ids=[self.user_employee.partner_id.id], message_type='comment', subtype='mail.mt_comment') @@ -105,7 +105,7 @@ class TestMailFeatures(TestMail): 'URL redirection: action with message_id for read-accredited user should redirect to Pigs' ) - @mute_logger('openerp.addons.mail.mail_mail', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_mail', 'openerp.models') def test_inbox_redirection_message_inbox(self): """ Inbox redirection: message without read access: Inbox """ message = self.group_pigs.message_post(body='My body', partner_ids=[self.user_employee.partner_id.id], message_type='comment', subtype='mail.mt_comment') @@ -138,7 +138,7 @@ class TestMailFeatures(TestMail): 'URL redirection: action without parameters should redirect to client action Inbox' ) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_needaction(self): na_emp1_base = self.env['mail.message'].sudo(self.user_employee)._needaction_count(domain=[]) na_emp2_base = self.env['mail.message'].sudo(self.user_employee_2)._needaction_count(domain=[]) @@ -174,42 +174,42 @@ class TestMessagePost(TestMail): 'res_model': 'mail.compose.message', 'res_id': 0}) self.group_pigs.message_subscribe_users(user_ids=self.user_employee.id) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_post_no_subscribe_author(self): original_followers = self.group_pigs.message_follower_ids self.group_pigs.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True}).message_post( body='Test Body', message_type='comment', subtype='mt_comment') self.assertEqual(self.group_pigs.message_follower_ids, original_followers) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_post_subscribe_author(self): original_followers = self.group_pigs.message_follower_ids self.group_pigs.sudo(self.user_employee).message_post( body='Test Body', message_type='comment', subtype='mt_comment') self.assertEqual(self.group_pigs.message_follower_ids, original_followers | self.user_employee.partner_id) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_post_no_subscribe_recipients(self): original_followers = self.group_pigs.message_follower_ids self.group_pigs.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True}).message_post( body='Test Body', message_type='comment', subtype='mt_comment', partner_ids=[(4, self.partner_1.id), (4, self.partner_2.id)]) self.assertEqual(self.group_pigs.message_follower_ids, original_followers) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_post_subscribe_recipients(self): original_followers = self.group_pigs.message_follower_ids self.group_pigs.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True, 'mail_post_autofollow': True}).message_post( body='Test Body', message_type='comment', subtype='mt_comment', partner_ids=[(4, self.partner_1.id), (4, self.partner_2.id)]) self.assertEqual(self.group_pigs.message_follower_ids, original_followers | self.partner_1 | self.partner_2) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_post_subscribe_recipients_partial(self): original_followers = self.group_pigs.message_follower_ids self.group_pigs.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True, 'mail_post_autofollow': True, 'mail_post_autofollow_partner_ids': [self.partner_2.id]}).message_post( body='Test Body', message_type='comment', subtype='mt_comment', partner_ids=[(4, self.partner_1.id), (4, self.partner_2.id)]) self.assertEqual(self.group_pigs.message_follower_ids, original_followers | self.partner_2) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_post_notifications(self): _body, _body_alt = '

Test Body

', 'Test Body' _subject = 'Test Subject' @@ -268,7 +268,7 @@ class TestMessagePost(TestMail): self.assertTrue(all(_body_alt in m['body'] for m in self._mails)) self.assertFalse(any(m['references'] for m in self._mails)) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_post_answer(self): _body = '

Test Body

' _subject = 'Test Subject' @@ -300,7 +300,7 @@ class TestMessagePost(TestMail): self.assertEqual(new_msg.parent_id.id, parent_msg.id, 'message_post: flatten error') self.assertFalse(new_msg.notified_partner_ids) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_message_compose(self): composer = self.env['mail.compose.message'].with_context({ 'default_composition_mode': 'comment', @@ -331,7 +331,7 @@ class TestMessagePost(TestMail): # TODO: test attachments ? - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_message_compose_mass_mail(self): composer = self.env['mail.compose.message'].with_context({ 'default_composition_mode': 'mass_mail', @@ -385,7 +385,7 @@ class TestMessagePost(TestMail): # self.assertEqual(set(group_bird.message_follower_ids.ids), set([self.partner_admin_id]), # 'compose wizard: mail_post_autofollow and mail_create_nosubscribe context keys not correctly taken into account') - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_message_compose_mass_mail_active_domain(self): composer = self.env['mail.compose.message'].with_context({ 'default_composition_mode': 'mass_mail', diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py index 407d0854740..68bbd3304e3 100644 --- a/addons/mail/tests/test_mail_gateway.py +++ b/addons/mail/tests/test_mail_gateway.py @@ -176,7 +176,7 @@ Content-Type: text/html; class TestMailgateway(TestMail): - @mute_logger('openerp.addons.mail.mail_thread') + @mute_logger('openerp.addons.mail.models.mail_thread') def test_message_parse(self): """ Test parsing of various scenarios of incoming emails """ res = self.env['mail.thread'].message_parse(MAIL_TEMPLATE_PLAINTEXT) @@ -208,7 +208,7 @@ class TestMailgateway(TestMail): res.get('body', ''), 'message_parse: second part of the html version should be in body after parsing multipart/mixed') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_alias_basic(self): """ Incoming email on an alias creating a new record + message_new + message details """ new_groups = self.format_and_process(MAIL_TEMPLATE, subject='My Frogs', to='groups@example.com, other@gmail.com') @@ -236,7 +236,7 @@ class TestMailgateway(TestMail): self.assertEqual(len(self._mails), 0, 'message_process: should create emails without any follower added') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_alias_user_id(self): """ Test alias ownership """ self.alias.write({'alias_user_id': self.user_employee.id}) @@ -248,7 +248,7 @@ class TestMailgateway(TestMail): self.assertEqual(res[0], self.user_employee.id, 'message_process: group should have been created by alias_user_id') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_email_email_from(self): """ Incoming email: not recognized author: email_from, no author_id, no followers """ new_groups = self.format_and_process(MAIL_TEMPLATE, to='groups@example.com, other@gmail.com') @@ -261,7 +261,7 @@ class TestMailgateway(TestMail): self.assertEqual(len(new_groups.message_follower_ids), 0, 'message_process: newly create group should not have any follower') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_email_author(self): """ Incoming email: recognized author: email_from, author_id, added as follower """ new_groups = self.format_and_process(MAIL_TEMPLATE, email_from='Valid Lelitre ', to='groups@example.com, valid.other@gmail.com') @@ -277,7 +277,7 @@ class TestMailgateway(TestMail): self.assertEqual(len(self._mails), 0, 'message_process: no bounce or notificatoin email should be sent with follower = author') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models', 'openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail') def test_message_process_alias_partners_bounce(self): """ Incoming email from an unknown partner on a Partners only alias -> bounce """ self.alias.write({'alias_contact': 'partners'}) @@ -292,7 +292,7 @@ class TestMailgateway(TestMail): self.assertIn('test.sylvie.lelitre@agrolait.com', self._mails[0].get('email_to'), 'message_process: bounce email on Partners alias should have original email sender as recipient') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models', 'openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail') def test_message_process_alias_followers_bounce(self): """ Incoming email from unknown partner / not follower partner on a Followers only alias -> bounce """ self.alias.write({ @@ -313,7 +313,7 @@ class TestMailgateway(TestMail): self.assertEqual(len(self._mails), 1, 'message_process: incoming email on Followers alias should send a bounce email') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_alias_partner(self): """ Incoming email from a known partner on a Partners alias -> ok (+ test on alias.user_id) """ self.alias.write({'alias_contact': 'partners'}) @@ -326,7 +326,7 @@ class TestMailgateway(TestMail): self.assertEqual(len(new_groups.message_ids), 1, 'message_process: newly created group should have the incoming email in message_ids') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_alias_followers(self): """ Incoming email from a parent document follower on a Followers only alias -> ok """ self.alias.write({ @@ -339,7 +339,7 @@ class TestMailgateway(TestMail): # Test: one group created by Raoul (or Sylvie maybe, if we implement it) self.assertEqual(len(new_groups), 1, 'message_process: a new mail.group should have been created') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models', 'openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail') def test_message_process_alias_update(self): """ Incoming email update discussion + notification email """ self.alias.write({'alias_force_thread_id': self.group_public.id}) @@ -363,7 +363,7 @@ class TestMailgateway(TestMail): self.assertEqual(self.group_public.message_follower_ids, self.partner_1 | self.partner_2, 'message_process: after reply, group should have 2 followers') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_in_reply_to(self): """ Incoming email using in-rely-to should go into the right destination event with a wrong destination """ self.format_and_process( @@ -375,7 +375,7 @@ class TestMailgateway(TestMail): self.assertEqual(len(self.group_public.message_ids), 2, 'message_process: group should contain one new message') self.assertEqual(len(self.fake_email.child_ids), 1, 'message_process: new message should be children of the existing one') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_references(self): """ Incoming email using in-rely-to should go into the right destination event with a wrong destination """ self.format_and_process( @@ -386,7 +386,7 @@ class TestMailgateway(TestMail): self.assertEqual(len(self.group_public.message_ids), 2, 'message_process: group should contain one new message') self.assertEqual(len(self.fake_email.child_ids), 1, 'message_process: new message should be children of the existing one') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_model_res_id(self): """ Incoming email with ref holding model / res_id but that does not match any message in the thread: must raise since OpenERP saas-3 """ self.assertRaises(ValueError, @@ -424,7 +424,7 @@ class TestMailgateway(TestMail): self.assertEqual(len(self.group_public.message_ids), 3, 'message_process: group should contain 6 messages') self.assertEqual(len(self.group_public.message_ids[0].child_ids), 0, 'message_process: msg1 should not have children') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_duplicate(self): """ Duplicate emails (same message_id) are not processed """ self.alias.write({'alias_force_thread_id': self.group_public.id,}) @@ -451,7 +451,7 @@ class TestMailgateway(TestMail): self.assertEqual(no_of_msg, 1, 'message_process: message with already existing message_id should not have been duplicated') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_partner_find(self): """ Finding the partner based on email, based on partner / user / follower """ from_1 = self.env['res.partner'].create({'name': 'A', 'email': 'from.test@example.com'}) @@ -472,7 +472,7 @@ class TestMailgateway(TestMail): self.format_and_process(MAIL_TEMPLATE, to='public@example.com', msg_id='<3>', email_from='Brice Denisse ') self.assertEqual(self.group_public.message_ids[0].author_id, from_3, 'message_process: email_from -> author_id wrong') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_crash_wrong_model(self): """ Incoming email with model that does not accepts incoming emails must raise """ self.assertRaises(ValueError, @@ -481,7 +481,7 @@ class TestMailgateway(TestMail): to='noone@example.com', subject='spam', extra='', model='res.country', msg_id='<1198923581.41972151344608186760.JavaMail.new4@agrolait.com>') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_crash_no_data(self): """ Incoming email without model and without alias must raise """ self.assertRaises(ValueError, @@ -490,7 +490,7 @@ class TestMailgateway(TestMail): to='noone@example.com', subject='spam', extra='', msg_id='<1198923581.41972151344608186760.JavaMail.new5@agrolait.com>') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_fallback(self): """ Incoming email with model that accepting incoming emails as fallback """ frog_groups = self.format_and_process( @@ -499,7 +499,7 @@ class TestMailgateway(TestMail): self.assertEqual(len(frog_groups), 1, 'message_process: erroneous email but with a fallback model should have created a new mail.group') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_plain_text(self): """ Incoming email in plaintext should be stored as html """ frog_groups = self.format_and_process( @@ -510,7 +510,7 @@ class TestMailgateway(TestMail): self.assertIn('
\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n
', msg.body, 'message_process: plaintext incoming email incorrectly parsed') - @mute_logger('openerp.addons.mail.mail_thread', 'openerp.models', 'openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail') def test_private_discussion(self): """ Testing private discussion between partners. """ msg1_pids = [self.user_employee_2.partner_id.id, self.partner_1.id] diff --git a/addons/mail/tests/test_mail_message.py b/addons/mail/tests/test_mail_message.py index c95c52c2f45..5a1ea592b3b 100644 --- a/addons/mail/tests/test_mail_message.py +++ b/addons/mail/tests/test_mail_message.py @@ -109,7 +109,7 @@ class TestMailMessage(TestMail): self.assertNotIn('mail.group', msg.message_id) self.assertNotIn('-%d-' % self.group_pigs.id, msg.message_id) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_mail_message_access_search(self): # Data: various author_ids, partner_ids, documents msg1 = self.env['mail.message'].create({ @@ -170,6 +170,7 @@ class TestMailMessage(TestMail): with self.assertRaises(except_orm): self.message.sudo(self.user_employee).read() + @mute_logger('openerp.models') def test_mail_message_access_read_crash_portal(self): with self.assertRaises(except_orm): self.message.sudo(self.user_portal).read(['body', 'message_type', 'subtype_id']) @@ -203,6 +204,7 @@ class TestMailMessage(TestMail): with self.assertRaises(AccessError): self.env['mail.message'].sudo(self.user_public).create({'model': 'mail.group', 'res_id': self.group_public.id, 'body': 'Test'}) + @mute_logger('openerp.models') def test_mail_message_access_create_crash(self): # Do: Bert create a private message -> ko, no creation rights with self.assertRaises(except_orm): diff --git a/addons/mail/tests/test_mail_template.py b/addons/mail/tests/test_mail_template.py index 38d132922fa..ffa8ac5bbd1 100644 --- a/addons/mail/tests/test_mail_template.py +++ b/addons/mail/tests/test_mail_template.py @@ -62,7 +62,7 @@ class TestMailTemplate(TestMail): self.assertEqual(set(attachments.mapped('res_model')), set(['res.partner'])) self.assertEqual(set(attachments.mapped('res_id')), set([self.user_admin.partner_id.id])) - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_composer_template_send(self): composer = self.env['mail.compose.message'].with_context({ 'default_composition_mode': 'comment', @@ -83,7 +83,7 @@ class TestMailTemplate(TestMail): # self.assertIn((attach.datas_fname, base64.b64decode(attach.datas)), _attachments_test, # 'mail.message attachment name / data incorrect') - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_composer_template_mass_mailing(self): composer = self.env['mail.compose.message'].with_context({ 'default_composition_mode': 'mass_mail', diff --git a/addons/mail/tests/test_message_read.py b/addons/mail/tests/test_message_read.py index 95b86845037..90f26332809 100644 --- a/addons/mail/tests/test_message_read.py +++ b/addons/mail/tests/test_message_read.py @@ -6,7 +6,7 @@ from openerp.tools import mute_logger class TestMessageRead(TestMail): - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def setUp(self): super(TestMessageRead, self).setUp() self.group_pigs.message_subscribe_users([self.user_employee.id]) diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py index 070578ae1f6..c21c405b240 100644 --- a/addons/portal/tests/test_portal.py +++ b/addons/portal/tests/test_portal.py @@ -31,7 +31,7 @@ class test_portal(TestMail): 'body': 'Body text'}) compose.send_mail() - @mute_logger('openerp.addons.mail.mail_mail') + @mute_logger('openerp.addons.mail.models.mail_mail') def test_invite_email_portal(self): group_pigs = self.group_pigs base_url = self.env['ir.config_parameter'].get_param('web.base.url', default='') @@ -83,7 +83,7 @@ class test_portal(TestMail): self.assertIn('login=%s' % self.user_employee.login, url, 'notification email: link should contain the user login') - @mute_logger('openerp.addons.mail.mail_mail', 'openerp.models') + @mute_logger('openerp.addons.mail.models.mail_mail', 'openerp.models') def test_inbox_redirection_portal(self): group_pigs = self.group_pigs port_act_id = self.ref('portal.action_mail_inbox_feeds_portal')