commit eaed0d1371d781d3f5effa1475f5202dea9467e7
author Gilad Arnold <garnold@chromium.org> Tue Apr 30 15:38:22 2013 -0700
committer ChromeBot <chrome-bot@google.com> Thu May 02 15:46:43 2013 -0700
tree 47579dbb2323becb26c525d85da1e33b459ee1ef
parent 4fbe409cb84e9ae89f22c6f3e80580ee49dbc0a2

paycheck: allow to disable specific checks

This became necessary as the delta generator appears to generate
payloads that fail certain checks (e.g. during update_engine unit
testing).

BUG=None
TEST=Disabled checks not being triggered

Change-Id: I4491e0cb32ef44f85e11ffb0402b40d1371525ae
Reviewed-on: https://gerrit.chromium.org/gerrit/49676
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>

scripts/paycheck.py

diff --git a/scripts/paycheck.py b/scripts/paycheck.py
index 7fd4b17..245b63e 100755
--- a/scripts/paycheck.py
+++ b/scripts/paycheck.py
@@ -62,6 +62,11 @@
                         help='assert a non-default (4096) payload block size')
   check_opts.add_option('-u', '--allow-unhashed', action='store_true',
                         default=False, help='allow unhashed operations')
+  check_opts.add_option('-d', '--disabled_tests', metavar='TESTLIST',
+                        default=(),
+                        help=('comma-separated list of tests to disable; '
+                              'available values: ' +
+                              ', '.join(update_payload.CHECKS_TO_DISABLE)))
   check_opts.add_option('-k', '--key', metavar='FILE',
                         help='public key to be used for signature verification')
   check_opts.add_option('-m', '--meta-sig', metavar='FILE',
@@ -84,6 +89,13 @@
   if opts.assert_type not in (None, _TYPE_FULL, _TYPE_DELTA):
     parser.error('invalid argument to --type: %s' % opts.assert_type)
 
+  # Convert and validate --disabled_tests value list, if provided.
+  if opts.disabled_tests:
+    opts.disabled_tests = opts.disabled_tests.split(',')
+    for test in opts.disabled_tests:
+      if test not in update_payload.CHECKS_TO_DISABLE:
+        parser.error('invalid argument to --disabled_tests: %s' % test)
+
   # Ensure consistent use of block tracing options.
   do_block_trace = opts.root_block or opts.kern_block
   if opts.skip and not do_block_trace:
@@ -145,7 +157,8 @@
               report_out_file=report_file,
               assert_type=options.assert_type,
               block_size=int(options.block_size),
-              allow_unhashed=options.allow_unhashed)
+              allow_unhashed=options.allow_unhashed,
+              disabled_tests=options.disabled_tests)
         finally:
           if do_close_report_file:
             report_file.close()