launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/fix-ec2test-utf8 into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


This branch fixes two test failures in the ec2test tests.
-- 
https://code.launchpad.net/~stevenk/launchpad/fix-ec2test-utf8/+merge/37832
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/fix-ec2test-utf8 into lp:launchpad/devel.

=== modified file 'lib/devscripts/ec2test/tests/test_remote.py'
--- lib/devscripts/ec2test/tests/test_remote.py	2010-10-06 22:03:55 +0000
+++ lib/devscripts/ec2test/tests/test_remote.py	2010-10-07 09:49:44 +0000
@@ -536,7 +536,7 @@
         [body, attachment] = email.get_payload()
         self.assertIsInstance(body, MIMEText)
         self.assertEqual('inline', body['Content-Disposition'])
-        self.assertEqual('text/plain; charset="utf8"', body['Content-Type'])
+        self.assertEqual('text/plain; charset="utf-8"', body['Content-Type'])
         self.assertEqual("foo", get_body_text(email))
 
     def test_report_email_attachment(self):
@@ -779,7 +779,7 @@
         [body, attachment] = email.get_payload()
         self.assertIsInstance(body, MIMEText)
         self.assertEqual('inline', body['Content-Disposition'])
-        self.assertEqual('text/plain; charset="utf8"', body['Content-Type'])
+        self.assertEqual('text/plain; charset="utf-8"', body['Content-Type'])
         self.assertEqual(
             logger.get_summary_contents(), body.get_payload(decode=True))
         self.assertIsInstance(attachment, MIMEApplication)