Make Progress support an arbitrary number of columns.

googletest/run_test_cases.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Runs each test cases as a single shard, single process execution.
 
 Similar to sharding_supervisor.py but finer grained. It runs each test case
 individually instead of running per shard. Runs multiple instances in parallel.
 """
@@ skipping 1164 matching lines @@
   if not clusters:
     clusters = calc_cluster_default(len(test_cases), jobs)
   else:
     # Limit the value.
     clusters = max(min(clusters, len(test_cases) / jobs), 1)
 
   logging.debug('%d test cases with clusters of %d', len(test_cases), clusters)
 
   if gtest_output:
     gtest_output = gen_gtest_output_dir(cwd, gtest_output)
-  progress = threading_utils.Progress(len(test_cases))
+  columns = [('index', 0), ('size', len(test_cases))]
+  progress = threading_utils.Progress(columns)
   progress.use_cr_only = not no_cr
-  serial_tasks = threading_utils.QueueWithProgress(0)
-  serial_tasks.set_progress(progress)
+  serial_tasks = threading_utils.QueueWithProgress(progress)
 
   def add_serial_task(priority, func, *args, **kwargs):
     """Adds a serial task, to be executed later."""
     assert isinstance(priority, int)
     assert callable(func)
     serial_tasks.put((priority, func, args, kwargs))
 
   with threading_utils.ThreadPoolWithProgress(
       progress, jobs, jobs, len(test_cases)) as pool:
     runner = ChromiumGoogleTestRunner(
@@ skipping 400 matching lines @@
         options.gtest_output,
         result_file,
         options.verbose)
   except Failure as e:
     print >> sys.stderr, e.args[0]
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))