Launchpad itself

Merge lp:~stevenk/launchpad/fix-ec2test-utf8 into lp:launchpad

  1. fix-ec2test-utf8
  2. Merge into devel
Proposed by Steve Kowalik on 2010-10-07
Status: Merged
Approved by: Jonathan Lange on 2010-10-07
Approved revision: no longer in the source branch.
Merged at revision: 11686
Proposed branch: lp:~stevenk/launchpad/fix-ec2test-utf8
Merge into: lp:launchpad
Diff against target: 23 lines (+4/-2)
1 file modified
lib/devscripts/ec2test/tests/test_remote.py (+4/-2)
To merge this branch: bzr merge lp:~stevenk/launchpad/fix-ec2test-utf8
Reviewer Review Type Date Requested Status
Jonathan Lange (community) 2010-10-07 Approve on 2010-10-07
Review via email: mp+37832@code.launchpad.net

Description of the Change

This branch fixes two test failures in the ec2test tests.

To post a comment you must log in.
Jonathan Lange (jml) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/devscripts/ec2test/tests/test_remote.py'
2--- lib/devscripts/ec2test/tests/test_remote.py 2010-10-06 22:03:55 +0000
3+++ lib/devscripts/ec2test/tests/test_remote.py 2010-10-07 09:59:45 +0000
4@@ -536,7 +536,8 @@
5 [body, attachment] = email.get_payload()
6 self.assertIsInstance(body, MIMEText)
7 self.assertEqual('inline', body['Content-Disposition'])
8- self.assertEqual('text/plain; charset="utf8"', body['Content-Type'])
9+ self.assertEqual(
10+ 'text/plain', body['Content-Type'].split(';')[0])
11 self.assertEqual("foo", get_body_text(email))
12
13 def test_report_email_attachment(self):
14@@ -779,7 +780,8 @@
15 [body, attachment] = email.get_payload()
16 self.assertIsInstance(body, MIMEText)
17 self.assertEqual('inline', body['Content-Disposition'])
18- self.assertEqual('text/plain; charset="utf8"', body['Content-Type'])
19+ self.assertEqual(
20+ 'text/plain', body['Content-Type'].split(';')[0])
21 self.assertEqual(
22 logger.get_summary_contents(), body.get_payload(decode=True))
23 self.assertIsInstance(attachment, MIMEApplication)