Merge lp:~gmb/tarmac/handle-unicode-test-output-properly into lp:tarmac

[Graham Binns]

Command.do_failed() now handles unicode output from commands sanely.

This branch fixes Command.do_failed()'s handling of unicode in stderr and stdout. Previously, there was no such handling; do_failed() would blow up with a UnicodeDecodeError when it encountered a character it couldn't handle. Now the output is decode()d as UTF-8.

[John A Meinel (jameinel)]

It seems like there is a missing test here, but IIRC I've run into this as well (gcc seems to produce non ASCII text sometimes).

review: Approve

[dobey (dobey)]

A combination of this and https://code.launchpad.net/~jameinel/tarmac/non_ascii-750930/+merge/73831 seems like it would be best.

Paul probably is not going to ever review any branches though, so that branch needs to be re-submitted afresh, without Paul as a reviewer.

I'm sorry some of these branches have been sitting here for so long. I've just now noticed them, and Paul is no longer doing anything with Tarmac, so I'll be taking things over and trying to get through all these branches as soon as I can.

review: Needs Fixing

[dobey (dobey)]

review: Disapprove

Unmerged revisions

407. By Graham Binns on 2013-05-07

Fixed the handling of unicode output from verify commands.

=== modified file 'tarmac/plugins/command.py'
--- tarmac/plugins/command.py	2011-09-02 04:06:25 +0000
+++ tarmac/plugins/command.py	2013-05-07 23:27:25 +0000
@@ -184,7 +184,9 @@
                    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)