Merge lp:~openerp-dev/openobject-addons/7.0-opw-603100-rgo into lp:openobject-addons/7.0

[Anaël Closson (openerp)]

Unmerged revisions

9860. By Ravi Gohil (OpenERP) on 2014-03-03

[FIX] Fixed translation issues(which leads the test cases to fail) for the unittests which is faced when installing/updating the mail module with default lang other than English set in OE server config file. (Maintenance Case: 603100)

=== modified file 'email_template/tests/test_mail.py'
--- email_template/tests/test_mail.py	2014-01-14 13:46:27 +0000
+++ email_template/tests/test_mail.py	2014-03-03 09:17:35 +0000
@@ -204,7 +204,7 @@
     @mute_logger('openerp.osv.orm', 'openerp.osv.orm')
     def test_10_email_templating(self):
         """ Tests designed for the mail.compose.message wizard updated by email_template. """
-        cr, uid, context = self.cr, self.uid, {}
+        cr, uid, context = self.cr, self.uid, {'lang': 'en_US'}
 
         # create the email.template on mail.group model
         group_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'mail.group')])[0]

=== modified file 'mail/tests/test_invite.py'
--- mail/tests/test_invite.py	2012-12-12 10:42:20 +0000
+++ mail/tests/test_invite.py	2014-03-03 09:17:35 +0000
@@ -30,7 +30,7 @@
 
         # Do: create a mail_wizard_invite, validate it
         self._init_mock_build_email()
-        context = {'default_res_model': 'mail.group', 'default_res_id': self.group_pigs_id}
+        context = {'default_res_model': 'mail.group', 'default_res_id': self.group_pigs_id, 'lang': 'en_US'}
         mail_invite_id = mail_invite.create(cr, self.user_raoul_id, {'partner_ids': [(4, self.partner_bert_id)]}, context)
         mail_invite.add_followers(cr, self.user_raoul_id, [mail_invite_id], {'default_model': 'mail.group', 'default_res_id': 0})
 

=== modified file 'mail/tests/test_mail_base.py'
--- mail/tests/test_mail_base.py	2013-03-20 11:41:11 +0000
+++ mail/tests/test_mail_base.py	2014-03-03 09:17:35 +0000
@@ -40,7 +40,7 @@
 
     def setUp(self):
         super(TestMailBase, self).setUp()
-        cr, uid = self.cr, self.uid
+        cr, uid, context = self.cr, self.uid, {'lang': 'en_US'}
 
         # Install mock SMTP gateway
         self._init_mock_build_email()
@@ -84,7 +84,7 @@
         self.group_pigs_id = self.mail_group.create(cr, uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'},
             {'mail_create_nolog': True})
-        self.group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        self.group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id, context)
 
     def tearDown(self):
         # Remove mocks

=== modified file 'mail/tests/test_mail_features.py'
--- mail/tests/test_mail_features.py	2013-08-23 12:06:11 +0000
+++ mail/tests/test_mail_features.py	2014-03-03 09:17:35 +0000
@@ -228,7 +228,7 @@
 
     def test_20_message_post(self):
         """ Tests designed for message_post. """
-        cr, uid, user_raoul, group_pigs = self.cr, self.uid, self.user_raoul, self.group_pigs
+        cr, uid, user_raoul, group_pigs, context = self.cr, self.uid, self.user_raoul, self.group_pigs, {'lang': 'en_US'}
 
         # --------------------------------------------------
         # Data creation
@@ -288,7 +288,7 @@
         msg1_id = self.mail_group.message_post(cr, user_raoul.id, self.group_pigs_id,
                             body=_body1, subject=_subject, partner_ids=[p_b_id, p_c_id],
                             attachment_ids=[attach1_id, attach2_id], attachments=_attachments,
-                            type='comment', subtype='mt_comment')
+                            type='comment', subtype='mt_comment', context=context)
         msg = self.mail_message.browse(cr, uid, msg1_id)
         msg_message_id = msg.message_id
         msg_pids = [partner.id for partner in msg.notified_partner_ids]
@@ -387,7 +387,7 @@
         msg2_id = self.mail_group.message_post(cr, user_raoul.id, self.group_pigs_id,
                         body=_body2, type='email', subtype='mt_comment',
                         partner_ids=[p_d_id], parent_id=msg1_id, attachment_ids=[attach3_id],
-                        context={'mail_post_autofollow': True})
+                        context=dict(context, mail_post_autofollow=True))
         msg = self.mail_message.browse(cr, uid, msg2_id)
         msg_pids = [partner.id for partner in msg.notified_partner_ids]
         msg_aids = [attach.id for attach in msg.attachment_ids]
@@ -667,7 +667,7 @@
             return body.replace(' ', '').replace('\n', '')
 
         # Data: subscribe Raoul to Pigs, because he will change the public attribute and may loose access to the record
-        cr, uid = self.cr, self.uid
+        cr, uid, context = self.cr, self.uid, {'lang': 'en_US'}
         self.mail_group.message_subscribe_users(cr, uid, [self.group_pigs_id], [self.user_raoul_id])
 
         # Data: res.users.group, to test group_public_id automatic logging
@@ -728,7 +728,7 @@
         self.assertIn(u'Pigs\u2192supername', _strip_string_spaces(last_msg.body), 'tracked feature: message body does not hold always tracked field')
 
         # Test: change public as public, group_public_id -> 1 subtype, name always tracked
-        self.mail_group.write(cr, self.user_raoul_id, [self.group_pigs_id], {'public': 'public', 'group_public_id': group_system_id})
+        self.mail_group.write(cr, self.user_raoul_id, [self.group_pigs_id], {'public': 'public', 'group_public_id': group_system_id}, context)
         self.group_pigs.refresh()
         self.assertEqual(len(self.group_pigs.message_ids), 4, 'tracked: one message should have been produced')
         # Test: first produced message: mt_group_public_id, with name always tracked, public tracked on change

=== modified file 'portal/tests/test_portal.py'
--- portal/tests/test_portal.py	2013-11-19 17:56:58 +0000
+++ portal/tests/test_portal.py	2014-03-03 09:17:35 +0000
@@ -110,7 +110,7 @@
 
         # Do: create a mail_wizard_invite, validate it
         self._init_mock_build_email()
-        context = {'default_res_model': 'mail.group', 'default_res_id': self.group_pigs_id}
+        context = {'default_res_model': 'mail.group', 'default_res_id': self.group_pigs_id, 'lang': 'en_US'}
         mail_invite_id = mail_invite.create(cr, uid, {'partner_ids': [(4, partner_carine_id)]}, context)
         mail_invite.add_followers(cr, uid, [mail_invite_id])
 
@@ -137,10 +137,10 @@
                             'body of invitation email does not contain signup url')
 
     def test_20_message_read(self):
-        cr, uid, group_port_id = self.cr, self.uid, self.group_port_id
+        cr, uid, group_port_id, context = self.cr, self.uid, self.group_port_id, {'lang': 'en_US'}
 
         # Data: custom subtypes
-        mt_group_public_id = self.mail_message_subtype.create(cr, uid, {'name': 'group_public', 'description': 'Group changed'})
+        mt_group_public_id = self.mail_message_subtype.create(cr, uid, {'name': 'group_public', 'description': 'Group changed'}, context)
         self.ir_model_data.create(cr, uid, {'name': 'mt_group_public', 'model': 'mail.message.subtype', 'module': 'mail', 'res_id': mt_group_public_id})
         # Data: post messages with various subtypes
         msg1_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body1', type='comment', subtype='mail.mt_comment')