[cc] Initial checkin of cc-frame-viewer

tools/cc-frame-viewer/third_party/py-chrome-app/run_tests

Index: tools/cc-frame-viewer/third_party/py-chrome-app/run_tests
diff --git a/tools/telemetry/telemetry/run_tests.py b/tools/cc-frame-viewer/third_party/py-chrome-app/run_tests
old mode 100644
new mode 100755
similarity index 54%
copy from tools/telemetry/telemetry/run_tests.py
copy to tools/cc-frame-viewer/third_party/py-chrome-app/run_tests
index e1c2128d13cbf8e0a52b0ba46e50eb81152c6c77..ec5125d20854a22b5f2180266c113c6d4775e9d4
--- a/tools/telemetry/telemetry/run_tests.py
+++ b/tools/cc-frame-viewer/third_party/py-chrome-app/run_tests
@@ -1,25 +1,25 @@
+#!/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.
+"""
+This script runs tests to verify that the perf tools are working.
+"""
 import fnmatch
 import logging
+import optparse
 import os
+import sys
 import traceback
 import unittest
 
-from telemetry import gtest_testrunner
-from telemetry import browser_options
-from telemetry import options_for_unittests
-
-
-def RequiresBrowserOfType(*types):
-  def wrap(func):
-    func._requires_browser_types = types
-    return func
-  return wrap
-
-
 def Discover(start_dir, pattern = 'test*.py', top_level_dir = None):
+  if hasattr(unittest.defaultTestLoader, 'discover'):
+    return unittest.defaultTestLoader.discover( # pylint: disable=E1101
+      start_dir,
+      pattern,
+      top_level_dir)
+
   modules = []
   for dirpath, _, filenames in os.walk(start_dir):
     for filename in filenames:
@@ -34,7 +34,10 @@ def Discover(start_dir, pattern = 'test*.py', top_level_dir = None):
       name, _ = os.path.splitext(filename)
 
       relpath = os.path.relpath(dirpath, top_level_dir)
-      fqn = relpath.replace('/', '.') + '.' + name
+      if relpath == '.':
+        fqn = name
+      else:
+        fqn = relpath.replace('/', '.') + '.' + name
 
       # load the module
       try:
@@ -46,7 +49,6 @@ def Discover(start_dir, pattern = 'test*.py', top_level_dir = None):
       modules.append(module)
 
   loader = unittest.defaultTestLoader
-  loader.suiteClass = gtest_testrunner.GTestTestSuite
   subsuites = []
   for module in modules:
     if hasattr(module, 'suite'):
@@ -55,11 +57,10 @@ def Discover(start_dir, pattern = 'test*.py', top_level_dir = None):
       new_suite = loader.loadTestsFromModule(module)
     if new_suite.countTestCases():
       subsuites.append(new_suite)
-  return gtest_testrunner.GTestTestSuite(subsuites)
-
+  return unittest.TestSuite(subsuites)
 
 def FilterSuite(suite, predicate):
-  new_suite = suite.__class__()
+  new_suite = unittest.TestSuite()
   for x in suite:
     if isinstance(x, unittest.TestSuite):
       subsuite = FilterSuite(x, predicate)
@@ -75,11 +76,7 @@ def FilterSuite(suite, predicate):
 
   return new_suite
 
-
-def DiscoverAndRunTests(dir_name, args, top_level_dir, runner=None):
-  if not runner:
-    runner = gtest_testrunner.GTestTestRunner(inner=True)
-
+def DiscoverAndRunTests(dir_name, args, top_level_dir):
   suite = Discover(dir_name, '*_unittest.py', top_level_dir)
 
   def IsTestSelected(test):
@@ -93,57 +90,53 @@ def DiscoverAndRunTests(dir_name, args, top_level_dir, runner=None):
 
     if hasattr(test, '_testMethodName'):
       method = getattr(test, test._testMethodName) # pylint: disable=W0212
-      if hasattr(method, '_requires_browser_types'):
-        types = method._requires_browser_types # pylint: disable=W0212
-        if options_for_unittests.GetBrowserType() not in types:
-          logging.debug('Skipping test %s because it requires %s' %
-                        (test.id(), types))
-          return False
+      # Test method filters go here.
 
     return True
 
   filtered_suite = FilterSuite(suite, IsTestSelected)
-  test_result = runner.run(filtered_suite)
-  return test_result
-
+  runner = unittest.TextTestRunner(verbosity = 2)
+  import chromeapp
+  chromeapp._unittests_running = True
+  try:
+    test_result = runner.run(filtered_suite)
+  finally:
+    chromeapp._unittests_running = False
+  return len(test_result.errors) + len(test_result.failures)
 
-def Main(args, start_dir, top_level_dir, runner=None):
+def Main(args, start_dir, top_level_dir):
   """Unit test suite that collects all test cases for telemetry."""
-  default_options = browser_options.BrowserOptions()
-  default_options.browser_type = 'any'
-
-  parser = default_options.CreateParser('run_tests [options] [test names]')
+  parser = optparse.OptionParser('run_tests [options] [test names]')
+  parser.add_option(
+      '-v', '--verbose', action='count', dest='verbosity',
+      help='Increase verbosity level (repeat as needed)')
   parser.add_option('--repeat-count', dest='run_test_repeat_count',
                     type='int', default=1,
                     help='Repeats each a provided number of times.')
 
-  _, args = parser.parse_args(args)
+  options, args = parser.parse_args(args)
 
-  if default_options.verbosity == 0:
+  if options.verbosity == 0:
     logging.getLogger().setLevel(logging.ERROR)
 
-  from telemetry import browser_finder
-  browser_to_create = browser_finder.FindBrowser(default_options)
-  if browser_to_create == None:
-    logging.error('No browser found of type %s. Cannot run tests.',
-                  default_options.browser_type)
-    logging.error('Re-run with --browser=list to see available browser types.')
-    return 1
-
-  options_for_unittests.Set(default_options,
-                            browser_to_create.browser_type)
   olddir = os.getcwd()
+  num_errors = 0
   try:
     os.chdir(top_level_dir)
-    success = True
     for _ in range(
-        default_options.run_test_repeat_count): # pylint: disable=E1101
-      success = success and DiscoverAndRunTests(start_dir, args, top_level_dir,
-                                                runner)
-    if success:
-      return 0
+        options.run_test_repeat_count): # pylint: disable=E1101
+      num_errors += DiscoverAndRunTests(start_dir, args, top_level_dir)
   finally:
     os.chdir(olddir)
-    options_for_unittests.Set(None, None)
 
-  return 1
+  return min(num_errors, 255)
+
+
+if __name__ == '__main__':
+  top_level_dir = os.path.abspath(
+    os.path.dirname(__file__))
+  start_dir = os.path.abspath('.')
+  ret = Main(
+    sys.argv[1:], start_dir, top_level_dir)
+
+  sys.exit(ret)