Attempt #4 to convert telemetry to the typ framework.

tools/telemetry/telemetry/unittest_util/run_chromeos_tests.py

 # Copyright 2014 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.
 import logging
 import os
-import sys
 
-from telemetry.unittest_util import gtest_progress_reporter
 from telemetry.unittest_util import run_tests
 from telemetry.core import util
 
 
 def RunTestsForChromeOS(browser_type, unit_tests, perf_tests):
   stream = _LoggingOutputStream()
   error_string = ''
 
-  logging.info('Running telemetry unit tests with browser_type "%s".' %
-               browser_type)
-  ret = _RunOneSetOfTests(browser_type, 'telemetry',
-                          os.path.join('telemetry', 'telemetry'),
-                          unit_tests, stream)
-  if ret:
-    error_string += 'The unit tests failed.\n'
+  if unit_tests:
+    logging.info('Running telemetry unit tests with browser_type "%s".' %
+                browser_type)
+    ret = _RunOneSetOfTests(browser_type, 'telemetry', unit_tests, stream)
+    if ret:
+      error_string += 'The unit tests failed.\n'
 
-  logging.info('Running telemetry perf tests with browser_type "%s".' %
-               browser_type)
-  ret = _RunOneSetOfTests(browser_type, 'perf', 'perf', perf_tests, stream)
-  if ret:
-    error_string = 'The perf tests failed.\n'
+  if perf_tests:
+    logging.info('Running telemetry perf tests with browser_type "%s".' %
+                browser_type)
+    ret = _RunOneSetOfTests(browser_type, 'perf', perf_tests, stream)
+    if ret:
+      error_string = 'The perf tests failed.\n'
 
   return error_string
 
 
-def _RunOneSetOfTests(browser_type, root_dir, sub_dir, tests, stream):
-  if not tests:
-    return
-  top_level_dir = os.path.join(util.GetChromiumSrcDir(), 'tools', root_dir)
-  sub_dir = os.path.join(util.GetChromiumSrcDir(), 'tools', sub_dir)
-
-  sys.path.append(top_level_dir)
-
-  output_formatters = [gtest_progress_reporter.GTestProgressReporter(stream)]
-  run_tests.config = run_tests.Config(top_level_dir, [sub_dir],
-                                      output_formatters)
-  return run_tests.RunTestsCommand.main(['--browser', browser_type] + tests)
+def _RunOneSetOfTests(browser_type, dir_name, tests, stream):
+  top_level_dir = os.path.join(util.GetChromiumSrcDir(), 'tools', dir_name)
+  args = ['--browser', browser_type,
+          '--top-level-dir', top_level_dir,
+          '--jobs', '1'] + tests
+  return run_tests.RunTestsCommand.main(args, stream=stream)
 
 
 class _LoggingOutputStream(object):
 
   def __init__(self):
     self._buffer = []
 
   def write(self, s):
     """Buffer a string write. Log it when we encounter a newline."""
     if '\n' in s:
       segments = s.split('\n')
       segments[0] = ''.join(self._buffer + [segments[0]])
       log_level = logging.getLogger().getEffectiveLevel()
       try:  # TODO(dtu): We need this because of crbug.com/394571
         logging.getLogger().setLevel(logging.INFO)
         for line in segments[:-1]:
           logging.info(line)
       finally:
         logging.getLogger().setLevel(log_level)
       self._buffer = [segments[-1]]
     else:
       self._buffer.append(s)
 
   def flush(self):  # pylint: disable=W0612
     pass