[MERGE] trunk

bzr revid: abo@openerp.com-20120926135428-6cgdiwg8ww1g8k8x

addons/base_calendar/test/base_calendar_test.yml

@@ -54,24 +54,3 @@
 -
     !python {model: calendar.event}: |
      self.write(cr, uid, [ref("calendar_event_alldaytestevent0")], {'alarm_id': ref("res_alarm_daybeforeeventstarts0")})
--
-  In order to assign attendee I will invite Demo user
-- 
-  !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
-    type: internal
-    send_mail: False
-    partner_id: base.res_partner_9 # Put bcz of problem in read
-    user_ids:
-      - base.user_demo
--
-  Then I click on Invite Button
--
-    !python {model: base_calendar.invite.attendee}: |
-     self.do_invite(cr, uid, [ref("base_calendar_invite_attendee_0")], {'active_id': ref("calendar_event_alldaytestevent0"), 'model' : 'calendar.event', 'attendee_field':'attendee_ids'})
--
-  Now I will Accept this invitation
--
-    !python {model: calendar.attendee}: |
-        ids = self.search(cr, uid, [('ref', '=', 'calendar.event' + ',' + str(ref("calendar_event_alldaytestevent0")))])
-        if ids:
-            self.do_accept(cr, uid, ids, context=context)

addons/mail/tests/test_mail.py

@@ -320,7 +320,7 @@ class test_mail(TestMailMockups):
         for sent_email in sent_emails:
             self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
             self.assertEqual(sent_email['body'], _mail_body1 + '\n<pre>Bert Tartopoils</pre>\n', 'sent_email body incorrect')
-            self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils', 'sent_email body_alternative is incorrect')
+            self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils\n', 'sent_email body_alternative is incorrect')
         # Test: mail_message: partner_ids = group followers
         message_pids = set([partner.id for partner in message.partner_ids])
         test_pids = set([p_a_id, p_b_id, p_c_id])