DeviceUtils.ForceStop: no-op if the app isn't running

build/android/devil/android/device_utils_test.py

 #!/usr/bin/env python
 # 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.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=protected-access
@@ skipping 609 matching lines @@
       self.device.Install(DeviceUtilsInstallTest.mock_apk,
           reinstall=True, retries=0, permissions=[])
 
   def testInstall_identicalPriorInstall_reinstall(self):
     with self.assertCalls(
         (self.call.device._GetApplicationPathsInternal('test.package'),
          ['/fake/data/app/test.package.apk']),
         (self.call.device._ComputeStaleApks('test.package',
             ['/fake/test/app.apk']),
          ([], None)),
-        (self.call.device.RunShellCommand(['am', 'force-stop', 'test.package'],
-                                          check_return=True))):
+        (self.call.device.ForceStop('test.package'))):
       self.device.Install(DeviceUtilsInstallTest.mock_apk,
           reinstall=True, retries=0, permissions=[])
 
   def testInstall_fails(self):
     with self.assertCalls(
         (self.call.device._GetApplicationPathsInternal('test.package'), []),
         (self.call.adb.Install('/fake/test/app.apk', reinstall=False),
          self.CommandError('Failure\r\n'))):
       with self.assertRaises(device_errors.CommandFailedError):
         self.device.Install(DeviceUtilsInstallTest.mock_apk, retries=0)
@@ skipping 671 matching lines @@
         (self.call.device.RunShellCommand(
             ['dumpsys', 'window', 'windows'], check_return=True,
             large_output=True),
          ['mCurrentFocus Launcher'])):
       self.device.GoHome()
 
 class DeviceUtilsForceStopTest(DeviceUtilsTest):
 
   def testForceStop(self):
     with self.assertCall(
-        self.call.adb.Shell('am force-stop test.package'),
+        self.call.adb.Shell('p=test.package;if [[ "$(ps)" = *$p* ]]; then '
+                            'am force-stop $p; fi'),
         ''):
       self.device.ForceStop('test.package')
 
 
 class DeviceUtilsClearApplicationStateTest(DeviceUtilsTest):
 
   def testClearApplicationState_setPermissions(self):
     with self.assertCalls(
         (self.call.device.GetProp('ro.build.version.sdk', cache=True), '17'),
         (self.call.device._GetApplicationPathsInternal('this.package.exists'),
@@ skipping 796 matching lines @@
   def testGrantPermissions_BlackList(self):
     with self.patch_call(
         self.call.device.build_version_sdk, return_value=23):
         self.device.GrantPermissions(
             'package', ['android.permission.ACCESS_MOCK_LOCATION'])
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)