[Android] Force stop test app before launch (start -S)

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.
 
 
 import logging
 import os
 import shlex
 import sys
 import tempfile
@@ skipping 60 matching lines @@
       raise errors.DeviceUnresponsiveError(
           'Unable to find fifo on device %s ' % self._GetFifo())
     args = shlex.split(self.adb.Adb()._target_arg)
     args += ['shell', 'cat', self._GetFifo()]
     return pexpect.spawn('adb', args, timeout=timeout, logfile=logfile)
 
   def ClearApplicationState(self):
     """Clear the application state."""
     self.adb.ClearApplicationState(self._apk_package_name)
 
+  def _StartActivity(self):
+    self.adb.StartActivity(
+        self._apk_package_name,
+        self._test_activity_name,
+        wait_for_completion=True,
+        action='android.intent.action.MAIN',
+        force_stop=True)
+
   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.adb.RunShellCommand(
-          'am start -n ' + self._apk_package_name + '/' +
-          self._test_activity_name)
+      self._StartActivity()
       # Wait for native test to complete.
       p = self._WatchFifo(timeout=30 * self.tool.GetTimeoutScale())
       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,
                                                            test_arguments))
 
   def RunTestsAndListResults(self):
     try:
       self.tool.SetupEnvironment()
       self._ClearFifo()
-      self.adb.RunShellCommand(
-        'am start -n ' + self._apk_package_name + '/' +
-        self._test_activity_name)
+      self._StartActivity()
     finally:
       self.tool.CleanUpEnvironment()
     logfile = android_commands.NewLineNormalizer(sys.stdout)
     return self._WatchTestOutput(self._WatchFifo(timeout=10, logfile=logfile))
 
   def _NeedsInstall(self):
-    pm_path_output = self.adb.RunShellCommand(
-        'pm path ' + self._apk_package_name)
-    if not pm_path_output:
+    installed_apk_path = self.adb.GetApplicationPath(self._apk_package_name)
+    if installed_apk_path:
+      return not self.adb.CheckMd5Sum(
+          self.test_suite_full, installed_apk_path, ignore_paths=True)
+    else:
       return True
-    # pm_path_output is of the form: "package:/path/to/foo.apk"
-    installed_apk_path = pm_path_output[0].split(':')[1]
-    return not self.adb.CheckMd5Sum(
-        self.test_suite_full, installed_apk_path, ignore_paths=True)
 
   def StripAndCopyExecutable(self):
     self.tool.CopyFiles()
     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]