[Andoid] Threaded TestRunner creation and SetUp and TearDown calls.

build/android/pylib/gtest/test_runner.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 glob
 import logging
 import os
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 145 matching lines @@
 
   def __init__(self, device, test_suite, test_arguments, timeout,
                cleanup_test_files, tool_name, build_type,
                in_webkit_checkout, test_apk_package_name=None,
                test_activity_name=None, command_line_file=None):
     super(TestRunner, self).__init__(device, tool_name, build_type)
     self._running_on_emulator = self.device.startswith('emulator')
     self._test_arguments = test_arguments
     self.in_webkit_checkout = in_webkit_checkout
     self._cleanup_test_files = cleanup_test_files
+    self._test_apk_package_name = test_apk_package_name
 
     logging.warning('Test suite: ' + test_suite)
     if os.path.splitext(test_suite)[1] == '.apk':
       self.test_package = test_package_apk.TestPackageApk(
           self.adb,
           device,
           test_suite,
           timeout,
           self._cleanup_test_files,
           self.tool,
@@ skipping 57 matching lines @@
         'filter',
         self.test_package.test_suite_basename)
     disabled_tests = run_tests_helper.GetExpectations(
        gtest_filter_base_path + '_disabled')
     if self._running_on_emulator:
       # Append emulator's filter file.
       disabled_tests.extend(run_tests_helper.GetExpectations(
           gtest_filter_base_path + '_emulator_additional_disabled'))
     return disabled_tests
 
+  def _ClearApplicationState(self):
+    """Kill the test process and clear application state."""
+    if self._test_apk_package_name:
+      self.adb.ClearApplicationState(self._test_apk_package_name)

[nilesh, 2013/02/23 01:24:10]

I think the killAllblocking can be in else: 

Or even better if we let test_package_apk and test_package_executable implement
their own ClearApplicationState

[craigdh, 2013/02/25 20:05:14]

Done.

+    self.adb.KillAllBlocking(self.test_package.test_suite_basename, 30)
+
   def RunTest(self, test):
     """Runs a test on a single device.
 
     Args:
       test: a gtest filter string to run.
 
     Returns:
       Tuple: (TestResults, test to retry or None)
     """
     test_results = test_result.TestResults()
     if not test:
       return test_results, None
 
     try:
+      self._ClearApplicationState()
       self.test_package.CreateTestRunnerScript(test, self._test_arguments)
       test_results = self.test_package.RunTestsAndListResults()
     except errors.DeviceUnresponsiveError as e:
       # Make sure this device is not attached
       logging.warning(e)
       if android_commands.IsDeviceAttached(self.device):
         raise
       test_results.device_exception = device_exception
     # Calculate unknown test results.
     # TODO(frankf): Do not break TestResults encapsulation.
     all_tests = set(test.split(':'))
     all_tests_ran = set([t.name for t in test_results.GetAll()])
     unknown_tests = all_tests - all_tests_ran
     test_results.unknown = [test_result.BaseTestResult(t, '') for t in
                             unknown_tests]
     retry = ':'.join([t.name for t in test_results.GetAllBroken()])
     return test_results, retry
 
   def SetUp(self):
     """Sets up necessary test enviroment for the test suite."""
     super(TestRunner, self).SetUp()
-    self.adb.ClearApplicationState(constants.CHROME_PACKAGE)
+    self._ClearApplicationState()

[nilesh, 2013/02/23 01:24:10]

I dont think we need it here now. The next line (StripAndCopyFiles) will
uninstall and install the package anyway.

[craigdh, 2013/02/25 20:05:14]

Done.

     self.StripAndCopyFiles()
     if _TestSuiteRequiresMockTestServer(self.test_package.test_suite_basename):
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()