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

[Sylvain Pineau]

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.

[Marc Tardif (cr3)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-19 14:35:12 +0000
+++ debian/changelog	2012-09-19 18:21:10 +0000
@@ -102,7 +102,10 @@
     Exit with proper error message if rendercheck is not installed.
     (LP: #1048262)
   * [FEATURE] jobs/suspend.txt.in: Add usb wakeup tests (mouse and keyboard).
-  * setup.py, qt/checkbox-qt.ui: Removed the old UI design file (LP: #1049912) 
+  * setup.py, qt/checkbox-qt.ui: Removed the old UI design file (LP: #1049912)
+  * jobs/rendercheck.txt.in, po/POTFILES.in, setup.cfg: Fixed the rendercheck
+    tests, added the suite file to setup.cfg/POTFILES.in and moved the 
+    rendercheck/tarball job into an attachment (LP #1053033)
 
   [Zygmunt Krynicki]
   * Fixed simple duplicate 'the' mistakes (LP: #1040022)
 
=== modified file 'jobs/rendercheck.txt.in'
--- jobs/rendercheck.txt.in	2012-08-25 16:47:04 +0000
+++ jobs/rendercheck.txt.in	2012-09-19 18:21:10 +0000
@@ -6,9 +6,8 @@
 _description:
  Runs all of the rendercheck test suites. This test can take a few minutes.
 
-plugin: shell
+plugin: attachment
 name: rendercheck/tarball
-requires:
- package.name == 'x11-apps'
 depends: rendercheck/tests
-command: [ -e $CHECKBOX_DATA/rendercheck-results ] && tar cvfz $CHECKBOX_DATA/rendercheck-results.tar.gz $CHECKBOX_DATA/rendercheck-results
 \ No newline at end of file
+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
+_description: Attach log from rendercheck tests
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-08-23 16:55:51 +0000
+++ po/POTFILES.in	2012-09-19 18:21:10 +0000
@@ -32,6 +32,7 @@
 [type: gettext/rfc822deb] jobs/pcmcia-pcix.txt.in
 [type: gettext/rfc822deb] jobs/peripheral.txt.in
 [type: gettext/rfc822deb] jobs/power-management.txt.in
+[type: gettext/rfc822deb] jobs/rendercheck.txt.in
 [type: gettext/rfc822deb] jobs/resource.txt.in
 [type: gettext/rfc822deb] jobs/server-services.txt.in
 [type: gettext/rfc822deb] jobs/smoke.txt.in
 
=== modified file 'setup.cfg'
--- setup.cfg	2012-08-22 14:24:59 +0000
+++ setup.cfg	2012-09-19 18:21:10 +0000
@@ -38,6 +38,7 @@
          "jobs/pcmcia-pcix.txt.in",
          "jobs/peripheral.txt.in",
          "jobs/power-management.txt.in",
+         "jobs/rendercheck.txt.in",
          "jobs/resource.txt.in",
          "jobs/server-services.txt.in",
          "jobs/smoke.txt.in",