Clean up Android gtest runners.

build/android/pylib/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 re
 import os
 
 import constants
 from perf_tests_helper import PrintPerfResult
 from pylib import pexpect
 from test_result import BaseTestResult, TestResults
 
 from android_commands import errors
 
-# TODO(bulach): TestPackage, TestPackageExecutable and
-# TestPackageApk are a work in progress related to making the native tests
-# run as a NDK-app from an APK rather than a stand-alone executable.
+
 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.
     timeout: Timeout for each test.
-    rebaseline: Whether or not to run tests in isolation and update the filter.
     performance_test: Whether or not performance test(s).
     cleanup_test_files: Whether or not to cleanup test files on device.
     tool: Name of the Valgrind tool.
     dump_debug_info: A debug_info object.
   """
 
-  def __init__(self, adb, device, test_suite, timeout, rebaseline,
+  def __init__(self, adb, device, test_suite, timeout,
                performance_test, cleanup_test_files, tool, dump_debug_info):
     self.adb = adb
     self.device = device
     self.test_suite_full = test_suite
     self.test_suite = os.path.splitext(test_suite)[0]
     self.test_suite_basename = self._GetTestSuiteBaseName()
     self.test_suite_dirname = os.path.dirname(
         self.test_suite.split(self.test_suite_basename)[0])
-    self.rebaseline = rebaseline
     self.performance_test = performance_test
     self.cleanup_test_files = cleanup_test_files
     self.tool = tool
     if timeout == 0:
       timeout = 60
     # On a VM (e.g. chromium buildbots), this timeout is way too small.
     if os.environ.get('BUILDBOT_SLAVENAME'):
       timeout = timeout * 2
     self.timeout = timeout * self.tool.GetTimeoutScale()
     self.dump_debug_info = dump_debug_info
 
   def _BeginGetIOStats(self):
     """Gets I/O statistics before running test.
 
     Return:
       I/O stats object.The I/O stats object may be None if the test is not
       performance test.
     """
     initial_io_stats = None
     # Try to get the disk I/O statistics for all performance tests.
-    if self.performance_test and not self.rebaseline:
+    if self.performance_test:
       initial_io_stats = self.adb.GetIoStats()
     return initial_io_stats
 
   def _EndGetIOStats(self, initial_io_stats):
     """Gets I/O statistics after running test and calcuate the I/O delta.
 
     Args:
       initial_io_stats: I/O stats object got from _BeginGetIOStats.
 
     Return:
@@ skipping 124 matching lines @@
         failed_tests += [BaseTestResult(full_test_name, p.before)]
     except pexpect.EOF:
       logging.error('Test terminated - EOF')
       raise errors.DeviceUnresponsiveError('Device may be offline')
     except pexpect.TIMEOUT:
       logging.error('Test terminated after %d second timeout.',
                     self.timeout)
       timed_out = True
     finally:
       p.close()
-    if not self.rebaseline:
-      ok_tests += self._EndGetIOStats(io_stats_before)
-      ret_code = self._GetGTestReturnCode()
-      if ret_code:
-        failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code,
-                                        'pexpect.before: %s'
-                                        '\npexpect.after: %s'
-                                        % (p.before,
-                                           p.after))]
+
+    ok_tests += self._EndGetIOStats(io_stats_before)
+    ret_code = self._GetGTestReturnCode()
+    if ret_code:
+      failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code,
+                                      'pexpect.before: %s'
+                                      '\npexpect.after: %s'
+                                      % (p.before,
+                                         p.after))]
     # Create TestResults and return
     return TestResults.FromRun(ok=ok_tests, failed=failed_tests,
                                crashed=crashed_tests, timed_out=timed_out,
                                overall_fail=overall_fail)