Relands test_runner.py, updates buildbot scripts

build/android/pylib/gtest/test_package_apk.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.
 
+"""Defines TestPackageApk to help run APK-based native tests."""
 
 import logging
 import os
 import shlex
 import sys
 import tempfile
 import time
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 74 matching lines @@
   def GetAllTests(self):
     """Returns a list of all tests available in the test suite."""
     self._CreateTestRunnerScript('--gtest_list_tests')
     try:
       self.tool.SetupEnvironment()
       # Clear and start monitoring logcat.
       self._ClearFifo()
       self._StartActivity()
       # Wait for native test to complete.
       p = self._WatchFifo(timeout=30 * self.tool.GetTimeoutScale())
-      p.expect("<<ScopedMainEntryLogger")
+      p.expect('<<ScopedMainEntryLogger')
       p.close()
     finally:
       self.tool.CleanUpEnvironment()
     # We need to strip the trailing newline.
     content = [line.rstrip() for line in p.before.splitlines()]
     ret = self._ParseGTestListTests(content)
     return ret
 
-  def CreateTestRunnerScript(self, gtest_filter, test_arguments):
-    self._CreateTestRunnerScript('--gtest_filter=%s %s' % (gtest_filter,
+  def CreateTestRunnerScript(self, test_filter, test_arguments):
+    self._CreateTestRunnerScript('--gtest_filter=%s %s' % (test_filter,
                                                            test_arguments))
 
   def RunTestsAndListResults(self):
     try:
       self.tool.SetupEnvironment()
       self._ClearFifo()
       self._StartActivity()
     finally:
       self.tool.CleanUpEnvironment()
     logfile = android_commands.NewLineNormalizer(sys.stdout)
@@ skipping 12 matching lines @@
     if self._NeedsInstall():
       # Always uninstall the previous one (by activity name); we don't
       # know what was embedded in it.
       self.adb.ManagedInstall(self.test_suite_full, False,
                               package_name=self._apk_package_name)
 
   def _GetTestSuiteBaseName(self):
     """Returns the  base name of the test suite."""
     # APK test suite names end with '-debug.apk'
     return os.path.basename(self.test_suite).rsplit('-debug', 1)[0]