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

[Brendan Donegan]

The rendercheck repeat test was hogging the runtime of this whole test so after consulting with a graphics expert we made the decision to blacklist it. This branch implements the blacklisting functionality and updates the rendercheck test and stress/graphics test to use it.

[Daniel Manrique (roadmr)]

Looks OK, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-29 18:21:40 +0000
+++ debian/changelog	2013-04-04 16:38:30 +0000
@@ -1,12 +1,16 @@
 checkbox (0.15.7) raring; urgency=low
 
-  * Incremented version
-
   [ Zygmunt Krynicki ]
   * jobs/graphics.txt.in, jobs/suspend.txt.in: convert package resource 
     programs to be compatible with plainbox
 
- -- Brendan Donegan <[e-mail]>  Fri, 29 Mar 2013 10:46:30 +0000
+  [ Brendan Donegan ]
+  * scripts/rendercheck_test, scripts/graphics_stress_test, 
+    jobs/rendercheck.txt.in, jobs/stress.txt.in - Allow blacklisting of 
+    specific rendercheck tests and use this to exclude the 'repeat' test
+    from the set of rendercheck tests that run (LP: #1164566)
+
+ -- Brendan Donegan <[e-mail]>  Thu, 04 Apr 2013 17:04:44 +0100
 
 checkbox (0.15.6) raring; urgency=low
 

=== modified file 'jobs/rendercheck.txt.in'
--- jobs/rendercheck.txt.in	2013-01-23 21:31:20 +0000
+++ jobs/rendercheck.txt.in	2013-04-04 16:38:30 +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 "Error running rendercheck. Please see the log $CHECKBOX_DATA/rendercheck-results for details" >&2 && false )
+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 )
 _description:
  Runs all of the rendercheck test suites. This test can take a few minutes.
 

=== modified file 'jobs/stress.txt.in'
--- jobs/stress.txt.in	2013-01-03 20:46:04 +0000
+++ jobs/stress.txt.in	2013-04-04 16:38:30 +0000
@@ -172,7 +172,7 @@
  package.name == 'x11-apps'
 user: root
 environ: CHECKBOX_DATA
-command: graphics_stress_test -d -o $CHECKBOX_DATA/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $CHECKBOX_DATA/graphics-stress-results for details" && false
+command: graphics_stress_test -b repeat -d -o $CHECKBOX_DATA/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $CHECKBOX_DATA/graphics-stress-results for details" && false
 _description:
  Run the graphics stress test. This test can take a few minutes.
 

=== modified file 'scripts/graphics_stress_test'
--- scripts/graphics_stress_test	2013-01-22 20:06:57 +0000
+++ scripts/graphics_stress_test	2013-04-04 16:38:30 +0000
@@ -324,6 +324,9 @@
                         action='store_true',
                         help='Choose this to add verbose output \
                               for debug purposes')
+    parser.add_argument('-b', '--blacklist',
+                        nargs='+',
+                        help='Name(s) of rendercheck test(s) to blacklist.')
     parser.add_argument('-o', '--output',
                         default='',
                         help='The path to the log which will be dumped. \
@@ -385,6 +388,9 @@
 
     rendercheck = RenderCheckWrapper(args.temp)
     tests = rendercheck.get_suites_list()
+    for test in args.blacklist:
+        if test in tests:
+            tests.remove(test)
 
     # Switch between the tty where X lives and tty10
     vt_wrap = VtWrapper()

=== modified file 'scripts/rendercheck_test'
--- scripts/rendercheck_test	2013-01-23 21:01:55 +0000
+++ scripts/rendercheck_test	2013-04-04 16:38:30 +0000
@@ -177,6 +177,9 @@
                               Available tests: \
                               %s. \
                               Default is all' % (', '.join(all_tests)))
+    parser.add_argument('-b', '--blacklist',
+                        nargs='+',
+                        help='The name of a test which should not be run.')
     parser.add_argument('-d', '--debug',
                         action='store_true',
                         help='Choose this to add verbose output \
@@ -246,6 +249,10 @@
     else:
         tests = args.test.split(',')
 
+    for test in args.blacklist:
+        if test in tests:
+            tests.remove(test)
+
     rendercheck = RenderCheck(args.temp)
     exit_status = rendercheck.run_test(tests, args.iterations,
                                        args.debug)