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

Proposed by James Westby on 2013-01-24
Status: Rejected
Rejected by: dobey on 2013-10-28
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 on 2013-10-28
Paul Hummer 2013-01-24 Approve on 2013-02-04
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.
James Westby (james-w) wrote :
Paul Hummer (rockstar) :
review: Approve
Paul Hummer (rockstar) wrote :

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

dobey (dobey) wrote :
review: Disapprove

Unmerged revisions

421. By James Westby on 2013-01-31

Merged setsid into utf8.

420. By James Westby on 2013-01-24

Drop unneeded change.

419. By James Westby on 2013-01-24

Merged setsid into utf8.

418. By James Westby on 2013-01-24

Merged branch-tree-properties into utf8.

417. By James Westby on 2013-01-23

Merge trunk.

416. By James Westby on 2013-01-23

Merge trunk.

415. By James Westby on 2012-12-18

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 on 2012-09-11

- Disable lightweight checkouts

413. By Sidnei da Silva on 2012-09-05

- Oops, target can be None here.

412. By Sidnei da Silva on 2012-09-05

- Die locks die

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 2013-02-01 17:16:21 +0000
3+++ tarmac/plugins/command.py 2013-02-01 17:16:21 +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