[Android] Rewrite base test result classes.

build/android/pylib/base/shard.py

 # Copyright (c) 2013 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.
 
 """Implements test sharding logic."""
 
 import logging
 import threading
 
 from pylib import android_commands
 from pylib import forwarder
 from pylib.utils import reraiser_thread
 
-import test_result
+import base_test_result
 
 
 class _ThreadSafeCounter(object):
   """A threadsafe counter."""
   def __init__(self):
     self._lock = threading.Lock()
     self._value = 0
 
   def GetAndIncrement(self):
     """Get the current value and increment it atomically.
@@ skipping 80 matching lines @@
     while True:
       r = self._pop()
       if r is None:
         break
       yield r
 
 
 def _RunTestsFromQueue(runner, test_collection, out_results):
   """Runs tests from the test_collection until empty using the given runner.
 
-  Adds TestResults objects to the out_results list and may add tests to the
+  Adds TestRunResults objects to the out_results list and may add tests to the
   out_retry list.
 
   Args:
     runner: A TestRunner object used to run the tests.
     test_collection: A _TestCollection from which to get _Test objects to run.
-    out_results: A list to add TestResults to.
+    out_results: A list to add TestRunResults to.
   """
   for test in test_collection:
     try:
       if not android_commands.IsDeviceAttached(runner.device):
         # Device is unresponsive, stop handling tests on this device.
         msg = 'Device %s is unresponsive.' % runner.device
         logging.warning(msg)
         raise android_commands.errors.DeviceUnresponsiveError(msg)
       result, retry = runner.RunTest(test.test)
       test.tries += 1
       if retry and test.tries <= 3:
         # Retry non-passing results, only record passing results.
-        out_results.append(test_result.TestResults.FromRun(ok=result.ok))
+        pass_results = base_test_result.TestRunResults()
+        pass_results.AddResults(result.GetPass())
+        out_results.append(pass_results)
         logging.warning('****Will retry test, try #%s.' % test.tries)
         test_collection.add(_Test(test=retry, tries=test.tries))
       else:
         # All tests passed or retry limit reached. Either way, record results.
         out_results.append(result)
     except android_commands.errors.DeviceUnresponsiveError:
       # Device is unresponsive, stop handling tests on this device and ensure
       # current test gets runs by another device. Don't reraise this exception
       # on the main thread.
       test_collection.add(test)
@@ skipping 32 matching lines @@
 
 
 def _RunAllTests(runners, tests):
   """Run all tests using the given TestRunners.
 
   Args:
     runners: a list of TestRunner objects.
     tests: a list of Tests to run using the given TestRunners.
 
   Returns:
-    A TestResults object.
+    A TestRunResults object.
   """
   logging.warning('****Running %s tests with %s test runners.' %
                   (len(tests), len(runners)))
   tests_collection = _TestCollection([_Test(t) for t in tests])
   results = []
   workers = reraiser_thread.ReraiserThreadGroup([reraiser_thread.ReraiserThread(
       _RunTestsFromQueue, [r, tests_collection, results]) for r in runners])
   workers.StartAll()
   workers.JoinAll()
-  return test_result.TestResults.FromTestResults(results)
+  run_results = base_test_result.TestRunResults()
+  for r in results:
+    run_results.AddTestRunResults(r)
+  return run_results
 
 
 def _CreateRunners(runner_factory, devices):
   """Creates a test runner for each device and calls SetUp() in parallel.
 
   Note: if a device is unresponsive the corresponding TestRunner will not be
     included in the returned list.
 
   Args:
     runner_factory: callable that takes a device and index and returns a
@@ skipping 31 matching lines @@
   """Run all tests on attached devices, retrying tests that don't pass.
 
   Args:
     runner_factory: callable that takes a device and index and returns a
       TestRunner object.
     devices: list of attached device serial numbers as strings.
     tests: list of tests to run.
     build_type: either 'Debug' or 'Release'.
 
   Returns:
-    A test_result.TestResults object.
+    A base_test_result.TestRunResults object.
   """
   forwarder.Forwarder.KillHost(build_type)
   runners = _CreateRunners(runner_factory, devices)
   try:
     return _RunAllTests(runners, tests)
   finally:
     try:
       _TearDownRunners(runners)
     except android_commands.errors.DeviceUnresponsiveError as e:
       logging.warning('****Device unresponsive during TearDown: [%s]', e)
     finally:
       forwarder.Forwarder.KillHost(build_type)