Merge lp:~james-w/tarmac/utf8 into lp:tarmac

Proposed by James Westby
Status: Rejected
Rejected by: dobey
Proposed branch: lp:~james-w/tarmac/utf8
Merge into: lp:tarmac
Prerequisite: lp:~james-w/tarmac/setsid
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
dobey Disapprove
Paul Hummer Approve
Review via email: mp+144807@code.launchpad.net

Commit message

Force output to utf-8

Description of the change

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

Those errors probably indicate an environment configuration issue, but this
change gives the user some indication of what was going on, rather than just
a UnicodeDecodeError traceback.

(from the u1 fork)

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :
Revision history for this message
Paul Hummer (rockstar) :
review: Approve
Revision history for this message
Paul Hummer (rockstar) wrote :

The prerequisite lp:~james-w/tarmac/setsid has not yet been merged into lp:tarmac.

Revision history for this message
dobey (dobey) wrote :
review: Disapprove

Unmerged revisions

421. By James Westby

Merged setsid into utf8.

420. By James Westby

Drop unneeded change.

419. By James Westby

Merged setsid into utf8.

418. By James Westby

Merged branch-tree-properties into utf8.

417. By James Westby

Merge trunk.

416. By James Westby

Merge trunk.

415. By James Westby

Decode stderr/stdout from the command, ignoring errors.

We were seeing UnicodeDecodeErrors in Jenkins on occaision, so
we changed the code to be more robust, and to discard anything
that couldn't be decoded from utf-8.

414. By Sidnei da Silva

- Disable lightweight checkouts

413. By Sidnei da Silva

- Oops, target can be None here.

412. By Sidnei da Silva

- Die locks die

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tarmac/plugins/command.py'
--- tarmac/plugins/command.py 2013-02-01 17:16:21 +0000
+++ tarmac/plugins/command.py 2013-02-01 17:16:21 +0000
@@ -185,7 +185,7 @@
185 u'%(output)s') % {185 u'%(output)s') % {
186 'source': self.proposal.source_branch.display_name,186 'source': self.proposal.source_branch.display_name,
187 'target': self.proposal.target_branch.display_name,187 'target': self.proposal.target_branch.display_name,
188 'output': u'\n'.join([stdout_value, stderr_value]),188 'output': u'\n'.join([stdout_value.decode('utf-8', 'ignore'), stderr_value.decode('utf-8', 'ignore')]),
189 }189 }
190 raise VerifyCommandFailed(message, comment)190 raise VerifyCommandFailed(message, comment)
191191

Subscribers

People subscribed via source and target branches