Merge lp:~thumper/launchpad/code-review-email-attachment-fix into lp:launchpad

[Tim Penhey]

Fix the content type and filename for code review attachments passed through.

[Tim Penhey (thumper)]

Attachment content type and filenames were extracted the wrong way around.

[Michael Hudson-Doyle (mwhudson)]

Doh!

Fix looks good.

review: Approve

=== modified file 'lib/lp/code/mail/codereviewcomment.py'
--- lib/lp/code/mail/codereviewcomment.py	2009-10-29 23:51:35 +0000
+++ lib/lp/code/mail/codereviewcomment.py	2010-02-22 23:20:40 +0000
@@ -133,7 +133,7 @@
     def _addAttachments(self, ctrl, email):
         """Add the attachments from the original message."""
         # Only reattach the display_aliases.
-        for content, content_type, filename in self.attachments:
+        for content, filename, content_type in self.attachments:
             # Append directly to the controller's list.
             ctrl.addAttachment(
                 content, content_type=content_type, filename=filename)

=== modified file 'lib/lp/code/mail/tests/test_codereviewcomment.py'
--- lib/lp/code/mail/tests/test_codereviewcomment.py	2009-11-01 23:13:29 +0000
+++ lib/lp/code/mail/tests/test_codereviewcomment.py	2010-02-22 23:20:40 +0000
@@ -215,6 +215,14 @@
         [outgoing_attachment] = mailer.attachments
         self.assertEqual('inc.diff', outgoing_attachment[1])
         self.assertEqual('text/x-diff', outgoing_attachment[2])
+        # The attachments are attached to the outgoing message.
+        person = bmp.target_branch.owner
+        message = mailer.generateEmail(
+            person.preferredemail.email, person).makeMessage()
+        self.assertTrue(message.is_multipart())
+        attachment = message.get_payload()[1]
+        self.assertEqual('inc.diff', attachment.get_filename())
+        self.assertEqual('text/x-diff', attachment['content-type'])
 
     def makeCommentAndParticipants(self):
         """Create a merge proposal and comment.