Make Progress support an arbitrary number of columns.

googletest/run_test_cases.py

Index: googletest/run_test_cases.py
diff --git a/googletest/run_test_cases.py b/googletest/run_test_cases.py
index e3944891e08e6b9176728e0c2c61f93ea7b472bd..eab5cbc021ebcf5f302ccc2c8f9198a5ea317a83 100755
--- a/googletest/run_test_cases.py
+++ b/googletest/run_test_cases.py
@@ -864,7 +864,7 @@ class GoogleTestRunner(object):
         #   detect that a test has been successfully retried).
         if i['output']:
           line += '\n' + i['output']
-      self.progress.update_item(line, index=1, size=need_to_retry)
+      self.progress.update_item(line, col0=1, col1=need_to_retry)
 
       if need_to_retry:
         priority = self._retry(priority, i['test_case'], try_count)
@@ -889,7 +889,7 @@ class GoogleTestRunner(object):
           self.progress.update_item(output, raw=True)
         for i in results:
           priority = self._retry(priority, i['test_case'], try_count)
-          self.progress.update_item('', size=1)
+          self.progress.update_item('', col1=1)
 
     # Only yield once the process completed when there is only one test case as
     # a safety precaution.
@@ -1182,10 +1182,9 @@ def run_test_cases(
 
   if gtest_output:
     gtest_output = gen_gtest_output_dir(cwd, gtest_output)
-  progress = threading_utils.Progress(len(test_cases))
+  progress = threading_utils.Progress([0, len(test_cases)])
   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."""