Refactor android test results logging.

build/android/run_tests.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.
 
 """Runs all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
@@ skipping 156 matching lines @@
         pass
       del os.environ['DISPLAY']
       self._pid = 0
 
 
 class TestSharder(BaseTestSharder):
   """Responsible for sharding the tests on the connected devices."""
 
   def __init__(self, attached_devices, test_suite, gtest_filter,
                test_arguments, timeout, cleanup_test_files, tool,
-               log_dump_name, fast_and_loose, build_type, in_webkit_checkout):
+               log_dump_name, fast_and_loose, build_type, in_webkit_checkout,
+               flakiness_server=None):
     BaseTestSharder.__init__(self, attached_devices, build_type)
     self.test_suite = test_suite
-    self.test_suite_basename = os.path.basename(test_suite)
     self.gtest_filter = gtest_filter or ''
     self.test_arguments = test_arguments
     self.timeout = timeout
     self.cleanup_test_files = cleanup_test_files
     self.tool = tool
     self.log_dump_name = log_dump_name
     self.fast_and_loose = fast_and_loose
     self.in_webkit_checkout = in_webkit_checkout
+    self.flakiness_server = flakiness_server
     self.all_tests = []
     if not self.gtest_filter:
       # No filter has been specified, let's add all tests then.
       self.all_tests, self.attached_devices = self._GetAllEnabledTests()
     self.tests = self.all_tests
 
   def _GetAllEnabledTests(self):
     """Get all enabled tests and available devices.
 
     Obtains a list of enabled tests from the test package on the device,
@@ skipping 66 matching lines @@
         self.test_arguments,
         self.timeout,
         self.cleanup_test_files, self.tool, index,
         not not self.log_dump_name,
         self.fast_and_loose,
         self.build_type,
         self.in_webkit_checkout)
 
   def OnTestsCompleted(self, test_runners, test_results):
     """Notifies that we completed the tests."""
-    test_results.LogFull('Unit test', os.path.basename(self.test_suite),
-                         self.build_type, self.all_tests)
+    test_results.LogFull(
+        test_type='Unit test',
+        test_package=test_runners[0].test_package.test_suite_basename,
+        build_type=self.build_type,
+        all_tests=self.all_tests,
+        flakiness_server=self.flakiness_server)
     test_results.PrintAnnotation()
+
     if self.log_dump_name:
       # Zip all debug info outputs into a file named by log_dump_name.
       debug_info.GTestDebugInfo.ZipAndCleanResults(
           os.path.join(
               cmd_helper.OutDirectory.get(), self.build_type,
               'debug_info_dumps'),
           self.log_dump_name)
 
 
 def _RunATestSuite(options):
@@ skipping 52 matching lines @@
       attached_devices,
       options.test_suite,
       options.gtest_filter,
       options.test_arguments,
       options.timeout,
       options.cleanup_test_files,
       options.tool,
       options.log_dump,
       options.fast_and_loose,
       options.build_type,
-      options.webkit)
+      options.webkit,
+      options.flakiness_dashboard_server)
   test_results = sharder.RunShardedTests()
 
   for buildbot_emulator in buildbot_emulators:
     buildbot_emulator.Shutdown()
 
   return len(test_results.failed)
 
 
 def Dispatch(options):
   """Dispatches the tests, sharding if possible.
@@ skipping 109 matching lines @@
   # the batch (this happens because the exit status is a sum of all failures
   # from all suites, but the buildbot associates the exit status only with the
   # most recent step).
   if options.exit_code:
     return failed_tests_count
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))