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

Proposed by James Westby on 2012-12-18
Status: Merged
Approved by: Jonathan Lange on 2012-12-19
Approved revision: 415
Merged at revision: 417
Proposed branch: lp:~james-w/tarmac/utf8
Merge into: lp:~ubuntuone-hackers/tarmac/trunk
Diff against target: 11 lines (+1/-1)
1 file modified
tarmac/plugins/command.py (+1/-1)
To merge this branch: bzr merge lp:~james-w/tarmac/utf8
Reviewer Review Type Date Requested Status
Jonathan Lange (community) 2012-12-18 Approve on 2012-12-19
Review via email: mp+140546@code.launchpad.net

Commit message

Handle unicode output from tests.

Description of the change

Hi,

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

Thanks,

James

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

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tarmac/plugins/command.py'
2--- tarmac/plugins/command.py 2012-03-06 19:55:15 +0000
3+++ tarmac/plugins/command.py 2012-12-18 21:19:19 +0000
4@@ -185,7 +185,7 @@
5 u'%(output)s') % {
6 'source': self.proposal.source_branch.display_name,
7 'target': self.proposal.target_branch.display_name,
8- 'output': u'\n'.join([stdout_value, stderr_value]),
9+ 'output': u'\n'.join([stdout_value.decode('utf-8', 'ignore'), stderr_value.decode('utf-8', 'ignore')]),
10 }
11 raise VerifyCommandFailed(message, comment)
12

Subscribers

People subscribed via source and target branches