Fix force stop using wrong "ps" cmd.

devil/devil/android/device_utils.py

 # Copyright 2014 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.
 
 """Provides a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=unused-argument
 
@@ skipping 1163 matching lines @@
 
     Args:
       package: A string containing the name of the package to stop.
       timeout: timeout in seconds
       retries: number of retries
 
     Raises:
       CommandTimeoutError on timeout.
       DeviceUnreachableError on missing device.
     """
-    cmd = 'p=%s;if [[ "$(ps)" = *$p* ]]; then am force-stop $p; fi'
-    self.RunShellCommand(cmd % package, shell=True, check_return=True)
+    cmd = ('p=%s;if [[ "$(%s)" = *$p* ]]; then am force-stop $p; fi' %

[jbudorick, 2017/04/11 23:47:24]

I'm wondering if maintaining the hotrolled script here is worth it vs switching
to

  if self.GetPids(process_name=package):
    self.RunShellCommand(['am', 'force-stop', package], check_return=True)

[perezju, 2017/04/12 09:13:20]

+1

+        (package, self._GetPsCommand()))
+    self.RunShellCommand(cmd, shell=True, check_return=True)
 
   @decorators.WithTimeoutAndRetriesFromInstance()
   def ClearApplicationState(
       self, package, permissions=None, timeout=None, retries=None):
     """Clear all state for the given package.
 
     Args:
       package: A string containing the name of the package to stop.
       permissions: List of permissions to set after clearing data.
       timeout: timeout in seconds
@@ skipping 950 matching lines @@
     Returns:
       A dict mapping process name to a list of PIDs for each process that
       contained the provided |process_name|.
 
     Raises:
       CommandTimeoutError on timeout.
       DeviceUnreachableError on missing device.
     """
     procs_pids = collections.defaultdict(list)
     try:
-      ps_cmd = 'ps'
-      # ps behavior was changed in Android above N, http://crbug.com/686716
-      if (self.build_version_sdk >= version_codes.NOUGAT_MR1
-          and self.build_id[0] > 'N'):
-        ps_cmd = 'ps -e'
+      ps_cmd = self._GetPsCommand()
       if process_name:
         ps_output = self._RunPipedShellCommand(
             '%s | grep -F %s' % (ps_cmd, cmd_helper.SingleQuote(process_name)))
       else:
         ps_output = self.RunShellCommand(
             ps_cmd.split(), check_return=True, large_output=True)
     except device_errors.AdbShellCommandFailedError as e:
       if e.status and isinstance(e.status, list) and not e.status[0]:
         # If ps succeeded but grep failed, there were no processes with the
         # given name.
@@ skipping 460 matching lines @@
       on: bool to decide state to switch to. True = on False = off.
     """
     def screen_test():
       return self.IsScreenOn() == on
 
     if screen_test():
       logger.info('Screen already in expected state.')
       return
     self.SendKeyEvent(keyevent.KEYCODE_POWER)
     timeout_retry.WaitFor(screen_test, wait_period=1)
+
+  def _GetPsCommand(self):
+    """Returns command to get list of processes.
+
+    Command to get list of processes is different for differnet Android
+    versions.
+    """
+    ps_cmd = 'ps'
+    # ps behavior was changed in Android above N, http://crbug.com/686716
+    if (self.build_version_sdk >= version_codes.NOUGAT_MR1
+        and self.build_id[0] > 'N'):
+      ps_cmd = 'ps -e'
+    return ps_cmd