Sends test results to new perf dashboard

scripts/slave/runtest.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.
 
 """A tool to run a chrome test executable, used by the buildbot slaves.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 24 matching lines @@
 # Because of this dependency on a chromium checkout, we need to disable some
 # pylint checks.
 # pylint: disable=E0611
 # pylint: disable=E1101
 from common import chromium_utils
 from common import gtest_utils
 import config
 from slave import crash_utils
 from slave import gtest_slave_utils
 from slave import process_log_utils
+from slave import results_dashboard
 from slave import slave_utils
 from slave import xvfb
 from slave.gtest.json_results_generator import GetSvnRevision
 
 USAGE = '%s [options] test.exe [test args]' % os.path.basename(sys.argv[0])
 
 CHROME_SANDBOX_PATH = '/opt/chromium/chrome_sandbox'
 
 DEST_DIR = 'gtest_results'
 
@@ skipping 285 matching lines @@
         factory_properties=options.factory_properties,
         webkit_revision=webkit_revision)
 
   if options.annotate and options.generate_json_file:
     tracker_obj.ProcessLine(_GetMasterString(_GetMaster()))
 
   return tracker_obj
 
 
 def annotate(test_name, result, results_tracker, full_name=False,
-             perf_dashboard_id=None):
+             perf_dashboard_id=None, results_url=None, system=None):
   """Given a test result and tracker, update the waterfall with test results."""
   get_text_result = process_log_utils.SUCCESS
 
   for failure in sorted(results_tracker.FailedTests()):
     if full_name:
       testabbr = re.sub(r'[^\w\.\-]', '_', failure)
     else:
       testabbr = re.sub(r'[^\w\.\-]', '_', failure.split('.')[-1])
     slave_utils.WriteLogLines(testabbr,
                               results_tracker.FailureDescription(failure))
@@ skipping 30 matching lines @@
 
   if hasattr(results_tracker, 'PerformanceLogs'):
     if not perf_dashboard_id:
       print 'runtest.py error: perf step specified but',
       print 'no test_id in factory_properties!'
       print '@@@STEP_EXCEPTION@@@'
       return
     for logname, log in results_tracker.PerformanceLogs().iteritems():
       lines = [str(l).rstrip() for l in log]
       slave_utils.WriteLogLines(logname, lines, perf=perf_dashboard_id)
+      if results_url:
+        results_dashboard.SendResults(
+            logname, lines, system, test_name, results_url)
 
 
 def get_build_dir_and_exe_path_mac(options, target_dir, exe_name):
   """Returns a tuple of the build dir and path to the executable in the
      specified target directory.
 
      Args:
        target_dir: the target directory where the executable should be found
            (e.g. 'Debug' or 'Release-iphonesimulator').
        exe_name: the name of the executable file in the target directory.
@@ skipping 124 matching lines @@
     if http_server:
       http_server.StopServer()
 
   if options.generate_json_file:
     _GenerateJSONForTestResults(options, results_tracker)
 
   if options.annotate:
     annotate(options.test_type, result, results_tracker,
              options.factory_properties.get('full_test_name'),
              perf_dashboard_id=options.factory_properties.get(
-                 'test_name'))
+                 'test_name'),
+             results_url=options.results_url,
+             system=options.factory_properties.get('perf_id'))
 
   return result
 
 
 def main_ios(options, args):
   if len(args) < 1:
     raise chromium_utils.MissingArgument('Usage: %s' % USAGE)
 
   def kill_simulator():
     chromium_utils.RunCommand(['/usr/bin/killall', 'iPhone Simulator'])
@@ skipping 225 matching lines @@
     if options.xvfb:
       xvfb.StopVirtualX(slave_name)
 
   if options.generate_json_file:
     _GenerateJSONForTestResults(options, results_tracker)
 
   if options.annotate:
     annotate(options.test_type, result, results_tracker,
              options.factory_properties.get('full_test_name'),
              perf_dashboard_id=options.factory_properties.get(
-                 'test_name'))
+                 'test_name'),
+             results_url=options.results_url,
+             system=options.factory_properties.get('perf_id'))
 
   return result
 
 
 def main_win(options, args):
   """Using the target build configuration, run the executable given in the
   first non-option argument, passing any following arguments to that
   executable.
   """
   if len(args) < 1:
@@ skipping 53 matching lines @@
   if options.enable_pageheap:
     slave_utils.SetPageHeap(build_dir, 'chrome.exe', False)
 
   if options.generate_json_file:
     _GenerateJSONForTestResults(options, results_tracker)
 
   if options.annotate:
     annotate(options.test_type, result, results_tracker,
              options.factory_properties.get('full_test_name'),
              perf_dashboard_id=options.factory_properties.get(
-                 'test_name'))
+                 'test_name'),
+             results_url=options.results_url,
+             system=options.factory_properties.get('perf_id'))
 
   return result
 
 
 def main():
   import platform
 
   xvfb_path = os.path.join(os.path.dirname(sys.argv[0]), '..', '..',
                            'third_party', 'xvfb', platform.architecture()[0])
 
@@ skipping 82 matching lines @@
   option_parser.add_option('', '--test-type', default='',
                            help='The test name that identifies the test, '
                                 'e.g. \'unit-tests\'')
   option_parser.add_option('', '--test-results-server', default='',
                            help='The test results server to upload the '
                                 'results.')
   option_parser.add_option('', '--annotate', default='',
                            help='Annotate output when run as a buildstep. '
                                 'Specify which type of test to parse, available'
                                 ' types listed with --annotate=list.')
+  option_parser.add_option('', '--results-url', default='',
+                           help='The URI of the perf dashboard to upload '
+                                'results to.')
   chromium_utils.AddPropertiesOptions(option_parser)
   options, args = option_parser.parse_args()
 
   options.test_type = options.test_type or options.factory_properties.get(
       'step_name')
 
   if options.run_shell_script and options.run_python_script:
     sys.stderr.write('Use either --run-shell-script OR --run-python-script, '
                      'not both.')
     return 1
@@ skipping 60 matching lines @@
         '%d new files were left in %s: Fix the tests to clean up themselves.'
         ) % ((new_temp_files - temp_files), tempfile.gettempdir())
     # TODO(maruel): Make it an error soon. Not yet since I want to iron out all
     # the remaining cases before.
     #result = 1
   return result
 
 
 if '__main__' == __name__:
   sys.exit(main())