Extend sharding_supervisor.py to accept the --verbose and --retries options.

tools/sharding_supervisor/sharding_supervisor.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Defer to run_test_cases.py."""
 
 import os
 import optparse
 import sys
@@ skipping 38 matching lines @@
       '--no-color', action='store_true', help='Ignored')
   group.add_option(
       '--retry-failed', action='store_true', help='Ignored')
   group.add_option(
       '-t', '--timeout', type='int', help='Kept as --timeout')
   group.add_option(
       '--total-slaves', type='int', default=1, help='Converted to --index')
   group.add_option(
       '--slave-index', type='int', default=0, help='Converted to --shards')
   parser.add_option_group(group)
+  group = optparse.OptionGroup(
+      parser, 'Options of run_test_cases.py passed through')
+  group.add_option(
+      '--retries', type='int', help='Kept as --retries')
+  group.add_option(
+      '--verbose', action='store_true', help='Kept as --verbose')

[M-A Ruel, 2013/08/12 14:29:59]

default=0, action='count'

[Alexander Potapenko, 2013/08/12 14:33:53]

Done.

+  parser.add_option_group(group)
 
   parser.disable_interspersed_args()
   options, args = parser.parse_args()
 
   swarm_client_dir = os.path.join(
       ROOT_DIR, 'tools', 'swarm_client', 'googletest')
   sys.path.insert(0, swarm_client_dir)
 
   cmd = [
     '--shards', str(options.total_slaves),
     '--index', str(options.slave_index),
     '--no-dump',
     '--no-cr',
   ]
   if options.timeout is not None:
     cmd.extend(['--timeout', str(options.timeout)])
+  if options.retries is not None:
+    cmd.extend(['--retries', str(options.retries)])
+  if options.verbose is not None:
+    cmd.extend(['--verbose'])

[M-A Ruel, 2013/08/12 14:29:59]

cmd.extend(['--verbose'] * options.verbose)

[Alexander Potapenko, 2013/08/12 14:33:53]

Done.

 
   run_test_cases_extra_args, rest = pop_known_arguments(args)
 
   import run_test_cases  # pylint: disable=F0401
 
   return run_test_cases.main(cmd + run_test_cases_extra_args + ['--'] + rest)
 
 
 if __name__ == '__main__':
   sys.exit(main())