Merge lp:~james-w/tarmac/utf8 into lp:~ubuntuone-hackers/tarmac/trunk

[James Westby]

Handle unicode output from tests.

Hi,

This is a bugfix we used in CA when we were seeing failures because of some
test output causing decode errors.

Thanks,

James

[Jonathan Lange (jml)]

LGTM

review: Approve

=== modified file 'tarmac/plugins/command.py'
--- tarmac/plugins/command.py	2012-03-06 19:55:15 +0000
+++ tarmac/plugins/command.py	2012-12-18 21:19:19 +0000
@@ -185,7 +185,7 @@
                    u'%(output)s') % {
             'source': self.proposal.source_branch.display_name,
             'target': self.proposal.target_branch.display_name,
-            'output': u'\n'.join([stdout_value, stderr_value]),
+            'output': u'\n'.join([stdout_value.decode('utf-8', 'ignore'), stderr_value.decode('utf-8', 'ignore')]),
             }
         raise VerifyCommandFailed(message, comment)