Merge lp:~mars/launchpad/fix-ec2test-utf-in-devel into lp:launchpad

[Māris Fogels]

Hi,

This branch fixes a problem on production-devel and Maverick local developer stations where a test would fail with a UTF-8 decoding error. This patch has already landed in production (see https://code.edge.launchpad.net/~mars/launchpad/fix-ec2test-on-production-devel/+merge/37526).

Maris

[Jonathan Lange (jml)]

Hey Mars,

I think the right approach is to change get_body_text() to use decode=True itself. The point of the helper is to get the text.

Also, strangely, these tests are failing for me in *stable*.

jml

review: Needs Fixing

[Leonard Richardson (leonardr)]

review: Approve

[Māris Fogels (mars)]

> Hey Mars,
>
> I think the right approach is to change get_body_text() to use decode=True
> itself. The point of the helper is to get the text.
>
> Also, strangely, these tests are failing for me in *stable*.
>
> jml

I saw this test failing for me in devel/Maverick, and in production-devel/Lucid. I don't know how it spread so widely.

I can fix the helper, but I also found that the reported TestResult changed if I did not do the calculations before the assertEquals() call. If the assertEquals() failed, then *its* TestResult would be used instead, to the great confusion of the developer.

I can change the helper.

[Māris Fogels (mars)]

Jono, does this fix look better?

=== modified file 'lib/devscripts/ec2test/tests/test_remote.py'
--- lib/devscripts/ec2test/tests/test_remote.py	2010-09-20 22:44:49 +0000
+++ lib/devscripts/ec2test/tests/test_remote.py	2010-10-06 17:12:45 +0000
@@ -888,7 +888,9 @@
     """Tests for how we handle the result at the end of the test suite."""
 
     def get_body_text(self, email):
-        return email.get_payload()[0].get_payload()
+        # Stringify the utf8-encoded MIME text message part containing the
+        # test run summary.
+        return email.get_payload(0).get_payload(decode=True)
 
     def make_empty_result(self):
         return TestResult()
@@ -986,10 +988,11 @@
         result = self.make_failing_result()
         logger.got_result(result)
         [user_message] = log
+        error_result_string = request.format_result(
+                result, logger._start_time, logger._end_time)
         self.assertEqual(
-            request.format_result(
-                result, logger._start_time, logger._end_time),
-            self.get_body_text(user_message).decode('quoted-printable'))
+            error_result_string,
+            self.get_body_text(user_message))
 
     def test_gzip_of_full_log_attached(self):
         # The full log is attached to the email.