Checkbox

Merge lp:~sylvain-pineau/checkbox/bug1053033 into lp:checkbox

  1. bug1053033
  2. Merge into trunk
Proposed by Sylvain Pineau
Status: Merged
Merged at revision: 1685
Proposed branch: lp:~sylvain-pineau/checkbox/bug1053033
Merge into: lp:checkbox
Diff against target: 57 lines (+9/-5)
4 files modified
debian/changelog (+4/-1)
jobs/rendercheck.txt.in (+3/-4)
po/POTFILES.in (+1/-0)
setup.cfg (+1/-0)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/bug1053033
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+125296@code.launchpad.net

Description of the change

This MR fixed the rendercheck suites by adding the relevant files to setup.cfg and POTFILES.in and by moving the rendercheck/tarball job into an attachment.

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

The rendercheck scripts are not used in Ubuntu Friendly, so I marked your changelog entry with [FEATURE] so that it's not accidently ported downstream to Ubuntu. There's really no reason to incur string changes that won't be used anyways.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-09-19 14:35:12 +0000
3+++ debian/changelog 2012-09-19 18:21:10 +0000
4@@ -102,7 +102,10 @@
5 Exit with proper error message if rendercheck is not installed.
6 (LP: #1048262)
7 * [FEATURE] jobs/suspend.txt.in: Add usb wakeup tests (mouse and keyboard).
8- * setup.py, qt/checkbox-qt.ui: Removed the old UI design file (LP: #1049912)
9+ * setup.py, qt/checkbox-qt.ui: Removed the old UI design file (LP: #1049912)
10+ * jobs/rendercheck.txt.in, po/POTFILES.in, setup.cfg: Fixed the rendercheck
11+ tests, added the suite file to setup.cfg/POTFILES.in and moved the
12+ rendercheck/tarball job into an attachment (LP #1053033)
13
14 [Zygmunt Krynicki]
15 * Fixed simple duplicate 'the' mistakes (LP: #1040022)
16
17=== modified file 'jobs/rendercheck.txt.in'
18--- jobs/rendercheck.txt.in 2012-08-25 16:47:04 +0000
19+++ jobs/rendercheck.txt.in 2012-09-19 18:21:10 +0000
20@@ -6,9 +6,8 @@
21 _description:
22 Runs all of the rendercheck test suites. This test can take a few minutes.
23
24-plugin: shell
25+plugin: attachment
26 name: rendercheck/tarball
27-requires:
28- package.name == 'x11-apps'
29 depends: rendercheck/tests
30-command: [ -e $CHECKBOX_DATA/rendercheck-results ] && tar cvfz $CHECKBOX_DATA/rendercheck-results.tar.gz $CHECKBOX_DATA/rendercheck-results
31\ No newline at end of file
32+command: [ -e $CHECKBOX_DATA/rendercheck-results ] && tar cvfz $CHECKBOX_DATA/rendercheck-results.tar.gz $CHECKBOX_DATA/rendercheck-results && cat $CHECKBOX_DATA/rendercheck-results.tar.gz
33+_description: Attach log from rendercheck tests
34
35=== modified file 'po/POTFILES.in'
36--- po/POTFILES.in 2012-08-23 16:55:51 +0000
37+++ po/POTFILES.in 2012-09-19 18:21:10 +0000
38@@ -32,6 +32,7 @@
39 [type: gettext/rfc822deb] jobs/pcmcia-pcix.txt.in
40 [type: gettext/rfc822deb] jobs/peripheral.txt.in
41 [type: gettext/rfc822deb] jobs/power-management.txt.in
42+[type: gettext/rfc822deb] jobs/rendercheck.txt.in
43 [type: gettext/rfc822deb] jobs/resource.txt.in
44 [type: gettext/rfc822deb] jobs/server-services.txt.in
45 [type: gettext/rfc822deb] jobs/smoke.txt.in
46
47=== modified file 'setup.cfg'
48--- setup.cfg 2012-08-22 14:24:59 +0000
49+++ setup.cfg 2012-09-19 18:21:10 +0000
50@@ -38,6 +38,7 @@
51 "jobs/pcmcia-pcix.txt.in",
52 "jobs/peripheral.txt.in",
53 "jobs/power-management.txt.in",
54+ "jobs/rendercheck.txt.in",
55 "jobs/resource.txt.in",
56 "jobs/server-services.txt.in",
57 "jobs/smoke.txt.in",

Subscribers

People subscribed via source and target branches