Merge lp:~brendan-donegan/checkbox/bug1093718 into lp:checkbox

[Brendan Donegan]

Based on https://bugs.launchpad.net/checkbox/+bug/1093718/comments/4 from Brian Sullivan and also the feedback from Alberto Milone on the same, the rendercheck gradients test generates false positives. This merge proposal fixes the rendercheck_test script so that multiple tests can be blacklisted, and adds gradients to the list of blacklisted tests in the rendercheck job.

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-02 22:35:51 +0000
+++ debian/changelog	2013-05-03 10:49:26 +0000
@@ -16,6 +16,12 @@
     with the root user, restore the workspaces switch and the HTML5 video
     playback ; remove the extra suspend/resume (LP: #1172851)
 
+  [ Brendan Donegan ]
+  * scripts/rendercheck_test - change nargs='+' to action='append' for blacklist
+    option so it works as expected.
+    jobs/rendercheck.txt.in - blacklist gradients test as it is known to produce
+    false positives. (LP: #1093718)
+
  -- Brendan Donegan <[e-mail]>  Fri, 26 Apr 2013 18:23:03 +0100
 
 checkbox (0.16) raring; urgency=low
 
=== modified file 'jobs/rendercheck.txt.in'
--- jobs/rendercheck.txt.in	2013-04-04 16:06:42 +0000
+++ jobs/rendercheck.txt.in	2013-05-03 10:49:26 +0000
@@ -2,7 +2,7 @@
 name: rendercheck/tests
 requires:
  package.name == 'x11-apps'
-command: ( rendercheck_test -b repeat -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 )
+command: ( rendercheck_test -b repeat -b gradients -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	2013-04-04 16:06:42 +0000
+++ scripts/rendercheck_test	2013-05-03 10:49:26 +0000
@@ -178,7 +178,7 @@
                               %s. \
                               Default is all' % (', '.join(all_tests)))
     parser.add_argument('-b', '--blacklist',
-                        nargs='+',
+                        action='append',
                         help='The name of a test which should not be run.')
     parser.add_argument('-d', '--debug',
                         action='store_true',