Merge lp:~cypressyew/checkbox/fix-xorg-version into lp:checkbox

Proposed by Po-Hsu Lin
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 4309
Merged at revision: 4309
Proposed branch: lp:~cypressyew/checkbox/fix-xorg-version
Merge into: lp:checkbox
Diff against target: 12 lines (+1/-1)
1 file modified
providers/plainbox-provider-checkbox/jobs/graphics.txt.in (+1/-1)
To merge this branch: bzr merge lp:~cypressyew/checkbox/fix-xorg-version
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+291971@code.launchpad.net

Description of the change

Make xorg-version job fail correctly.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1, thanks for the fix. Tested on a system without X, it works as expected

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-checkbox/jobs/graphics.txt.in'
2--- providers/plainbox-provider-checkbox/jobs/graphics.txt.in 2016-01-21 09:03:50 +0000
3+++ providers/plainbox-provider-checkbox/jobs/graphics.txt.in 2016-04-15 03:43:58 +0000
4@@ -12,7 +12,7 @@
5 category_id: 2013.com.canonical.plainbox::graphics
6 id: graphics/xorg-version
7 requires: package.name == "x11-utils"
8-command: xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
9+command: set -o pipefail; xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
10 estimated_duration: 0.018
11 _description: Test to output the Xorg version
12 _summary: Test Xorg version

Subscribers

People subscribed via source and target branches