Kill old browser rather than close

build/android/pylib/device/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=C0321
@@ skipping 539 matching lines @@
         'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'):
       with self.assertRaises(device_errors.CommandFailedError):
         self.device.KillAll('test_process')
 
   def testKillAll_nonblocking(self):
     with self.assertCallsSequence([
         ("adb -s 0123456789abcdef shell 'ps'",
          'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'
          'u0_a1  1234  174   123456 54321 ffffffff 456789ab '
               'this.is.a.test.process\r\n'),
-        ("adb -s 0123456789abcdef shell 'ps'",
-         'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'
-         'u0_a1  1234  174   123456 54321 ffffffff 456789ab '
-              'this.is.a.test.process\r\n'),
         ("adb -s 0123456789abcdef shell 'kill -9 1234'", '')]):
-      self.device.KillAll('this.is.a.test.process', blocking=False)
+      self.assertEquals(1,
+          self.device.KillAll('this.is.a.test.process', blocking=False))
 
   def testKillAll_blocking(self):
     with mock.patch('time.sleep'):
       with self.assertCallsSequence([
           ("adb -s 0123456789abcdef shell 'ps'",
            'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'
            'u0_a1  1234  174   123456 54321 ffffffff 456789ab '
                 'this.is.a.test.process\r\n'),
-          ("adb -s 0123456789abcdef shell 'ps'",
-           'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'
-           'u0_a1  1234  174   123456 54321 ffffffff 456789ab '
-                'this.is.a.test.process\r\n'),
           ("adb -s 0123456789abcdef shell 'kill -9 1234'", ''),
           ("adb -s 0123456789abcdef shell 'ps'",
            'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'
            'u0_a1  1234  174   123456 54321 ffffffff 456789ab '
                 'this.is.a.test.process\r\n'),
           ("adb -s 0123456789abcdef shell 'ps'",
            'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n')]):
-        self.device.KillAll('this.is.a.test.process', blocking=True)
+        self.assertEquals(1,
+            self.device.KillAll('this.is.a.test.process', blocking=True))
 
   def testKillAll_root(self):
     with self.assertCallsSequence([
           ("adb -s 0123456789abcdef shell 'ps'",
            'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'
            'u0_a1  1234  174   123456 54321 ffffffff 456789ab '
                 'this.is.a.test.process\r\n'),
-          ("adb -s 0123456789abcdef shell 'ps'",
-           'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'
-           'u0_a1  1234  174   123456 54321 ffffffff 456789ab '
-                'this.is.a.test.process\r\n'),
+          ("adb -s 0123456789abcdef shell 'ls /root'", 'Permission denied\r\n'),
           ("adb -s 0123456789abcdef shell 'su -c kill -9 1234'", '')]):
-      self.device.KillAll('this.is.a.test.process', as_root=True)
+      self.assertEquals(1,
+          self.device.KillAll('this.is.a.test.process', as_root=True))
 
   def testKillAll_sigterm(self):
     with self.assertCallsSequence([
         ("adb -s 0123456789abcdef shell 'ps'",
          'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'
          'u0_a1  1234  174   123456 54321 ffffffff 456789ab '
               'this.is.a.test.process\r\n'),
-        ("adb -s 0123456789abcdef shell 'ps'",
-         'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\r\n'
-         'u0_a1  1234  174   123456 54321 ffffffff 456789ab '
-              'this.is.a.test.process\r\n'),
         ("adb -s 0123456789abcdef shell 'kill -15 1234'", '')]):
-      self.device.KillAll('this.is.a.test.process', signum=signal.SIGTERM)
+      self.assertEquals(1,
+          self.device.KillAll('this.is.a.test.process', signum=signal.SIGTERM))
 
 
 class DeviceUtilsStartActivityTest(DeviceUtilsOldImplTest):
 
   def testStartActivity_actionOnly(self):
     test_intent = intent.Intent(action='android.intent.action.VIEW')
     with self.assertCalls(
         "adb -s 0123456789abcdef shell 'am start "
             "-a android.intent.action.VIEW'",
         'Starting: Intent { act=android.intent.action.VIEW }'):
@@ skipping 871 matching lines @@
     self.device = device_utils.DeviceUtils(None)
     with self.assertCalls('adb  get-serialno', 'unknown'), (
          self.assertRaises(device_errors.NoDevicesError)):
       str(self.device)
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)