Merge lp:~bladernr/checkbox/1103343-rendercheck-test-fix into lp:checkbox

[Jeff Lane ]

Jeffrey Chang noticed that when rendercheck_test is run on a system without rendercheck installed, checkbox still records a passing error. This appears to be because rendercheck_test depended on the errno module, but that module was never imported. This MR adds the missing import for errno which resolves the issue, causing rendercheck to exit with a fail code properly if rendercheck is not present on the SUT.

Additionally, I've reworded the command definition to properly return a fail code if rendercheck fails to run or exits with errors.

[Daniel Manrique (roadmr)]

Short and sweet. I checked the shell logic with some dummy commands, and I agree on the errno inclusion. I guess the original author didn't test on a system *without* rendercheck :)

Anyway, merging.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-22 20:06:57 +0000
+++ debian/changelog	2013-01-23 21:33:23 +0000
@@ -8,6 +8,9 @@
   [ Jeff Lane ]
   * jobs/monitor.txt.in - added new job monitor/multi-head to test mulitple
     displays on desktops. 
+  * scripts/rendercheck_test - added missing import for errno (LP: #1103343)
+    jobs/rendercheck.txt.in - fixed command string to report the correct exit
+    code to checkbox
   
   [ Brendan Donegan ]
   * jobs/bluetooth.txt.in, jobs/suspend.txt.in - unblock Bluetooth hardware
@@ -21,7 +24,7 @@
     in config file in the event the system under test does not have internet
     access. Updated jobs/virtualization.txt.in
 
- -- Jeff Marcom <[e-mail]>  Wed, 09 Jan 2013 16:40:02 -0500
+ -- Jeff Marcom <[e-mail]>  Wed, 23 Jan 2013 16:30:22 -0500
 
 checkbox (0.15) raring; urgency=low
 
 
=== modified file 'jobs/rendercheck.txt.in'
--- jobs/rendercheck.txt.in	2012-09-23 16:51:13 +0000
+++ jobs/rendercheck.txt.in	2013-01-23 21:33:23 +0000
@@ -2,7 +2,7 @@
 name: rendercheck/tests
 requires:
  package.name == 'x11-apps'
-command: rendercheck_test -d -o $CHECKBOX_DATA/rendercheck-results && echo "Rendercheck tests completed successfully" || echo "Rendercheck completed, but there are errors. Please see the log $CHECKBOX_DATA/rendercheck-results for details"
+command: ( rendercheck_test -d -o $CHECKBOX_DATA/rendercheck-results && echo "Rendercheck tests completed successfully" ) || ( echo "Error running rendercheck. Please see the log $CHECKBOX_DATA/rendercheck-results for details" >&2 && false )
 _description:
  Runs all of the rendercheck test suites. This test can take a few minutes.
 
 
=== modified file 'scripts/rendercheck_test'
--- scripts/rendercheck_test	2012-09-12 12:16:52 +0000
+++ scripts/rendercheck_test	2013-01-23 21:33:23 +0000
@@ -29,6 +29,7 @@
 import os
 import re
 import tempfile
+import errno
 
 
 class RenderCheck(object):