[Android] Rewrite base test result classes.

build/android/pylib/gtest/test_package.py

 # 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.
 
 
 import logging
+import os
 import re
-import os
 
 from pylib import constants
 from pylib import pexpect
 from pylib.android_commands import errors
-from pylib.base.test_result import BaseTestResult, TestResults
+from pylib.base.base_test_result import BaseTestResult

[craigdh, 2013/03/23 00:41:39]

import modules, not classes

[frankf, 2013/03/23 01:32:59]

Done.

+from pylib.base.base_test_result import TestRunResults
+from pylib.base.base_test_result import TestType
 from pylib.perf_tests_helper import PrintPerfResult
 
 
 class TestPackage(object):
   """A helper base class for both APK and stand-alone executables.
 
   Args:
     adb: ADB interface the tests are using.
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
@@ skipping 92 matching lines @@
           self.test_suite_dirname + '/linux_dumper_unittest_helper',
           constants.TEST_EXECUTABLE_DIR + '/linux_dumper_unittest_helper')
     if self.test_suite_basename == 'content_browsertests':
       self.adb.PushIfNeeded(
           self.test_suite_dirname +
           '/../content_shell/assets/content_shell.pak',
           external_storage + '/paks/content_shell.pak')
 
   def _WatchTestOutput(self, p):
     """Watches the test output.
+
     Args:
       p: the process generating output as created by pexpect.spawn.
     """
-    ok_tests = []
-    failed_tests = []
-    crashed_tests = []
-    timed_out_tests = []
+    results = TestRunResults()
 
     # Test case statuses.
     re_run = re.compile('\[ RUN      \] ?(.*)\r\n')
     re_fail = re.compile('\[  FAILED  \] ?(.*)\r\n')
     re_ok = re.compile('\[       OK \] ?(.*?) .*\r\n')
 
     # Test run statuses.
     re_passed = re.compile('\[  PASSED  \] ?(.*)\r\n')
     re_runner_fail = re.compile('\[ RUNNER_FAILED \] ?(.*)\r\n')
     # Signal handlers are installed before starting tests
     # to output the CRASHED marker when a crash happens.
     re_crash = re.compile('\[ CRASHED      \](.*)\r\n')
 
     try:
       while True:
         full_test_name = None
-
         found = p.expect([re_run, re_passed, re_runner_fail],
                          timeout=self.timeout)
         if found == 1:  # re_passed
           break
         elif found == 2:  # re_runner_fail
           break
         else:  # re_run
           full_test_name = p.match.group(1).replace('\r', '')
           found = p.expect([re_ok, re_fail, re_crash], timeout=self.timeout)
           if found == 0:  # re_ok
             if full_test_name == p.match.group(1).replace('\r', ''):
-              ok_tests += [BaseTestResult(full_test_name, p.before)]
+              results.AddResult(BaseTestResult(
+                  full_test_name, TestType.PASS, log=p.before))
           elif found == 2:  # re_crash
-            crashed_tests += [BaseTestResult(full_test_name, p.before)]
+            results.AddResult(BaseTestResult(
+                full_test_name, TestType.CRASH, log=p.before))
             break
           else:  # re_fail
-            failed_tests += [BaseTestResult(full_test_name, p.before)]
+            results.AddResult(BaseTestResult(
+                full_test_name, TestType.FAIL, log=p.before))
     except pexpect.EOF:
       logging.error('Test terminated - EOF')
       # We're here because either the device went offline, or the test harness
       # crashed without outputting the CRASHED marker (crbug.com/175538).
       if not self.adb.IsOnline():
         raise errors.DeviceUnresponsiveError('Device %s went offline.' %
                                              self.device)
       elif full_test_name:
-        crashed_tests += [BaseTestResult(full_test_name, p.before)]
+        results.AddResult(
+            BaseTestResult(full_test_name, TestType.CRASH, log=p.before))
     except pexpect.TIMEOUT:
       logging.error('Test terminated after %d second timeout.',
                     self.timeout)
       if full_test_name:
-        timed_out_tests += [BaseTestResult(full_test_name, p.before)]
+        results.AddResult(
+            BaseTestResult(full_test_name, TestType.TIMEOUT, log=p.before))
     finally:
       p.close()
 
     ret_code = self._GetGTestReturnCode()
     if ret_code:
       logging.critical(
           'gtest exit code: %d\npexpect.before: %s\npexpect.after: %s',
           ret_code, p.before, p.after)
 
-    # Create TestResults and return
-    return TestResults.FromRun(ok=ok_tests, failed=failed_tests,
-                               crashed=crashed_tests, timed_out=timed_out_tests)
+    return results