[Android] Make SetJavaAsserts return True if a restart is required.

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 1294 matching lines @@
             '100 B/s (100 bytes in 1.000s)\r\n'),
            ('adb -s 0123456789abcdef push %s %s' %
                 (mock_file.name, constants.DEVICE_LOCAL_PROPERTIES_PATH),
             '100 B/s (100 bytes in 1.000s)\r\n'),
            ('adb -s 0123456789abcdef shell '
                 'getprop dalvik.vm.enableassertions',
             '\r\n'),
            ('adb -s 0123456789abcdef shell '
                 'setprop dalvik.vm.enableassertions "all"',
             '')]):
-        self.device.SetJavaAsserts(True)
+        self.assertTrue(self.device.SetJavaAsserts(True))
 
   def testSetJavaAsserts_disable(self):
     mock_file = self.mockNamedTemporary(
         read_contents='dalvik.vm.enableassertions=all\n')
     with mock.patch('tempfile.NamedTemporaryFile',
                     return_value=mock_file), (
          mock.patch('__builtin__.open', return_value=mock_file)):
       with self.assertCallsSequence(
           [('adb -s 0123456789abcdef shell ls %s' %
                 constants.DEVICE_LOCAL_PROPERTIES_PATH,
             '%s\r\n' % constants.DEVICE_LOCAL_PROPERTIES_PATH),
            ('adb -s 0123456789abcdef pull %s %s' %
                 (constants.DEVICE_LOCAL_PROPERTIES_PATH, mock_file.name),
             '100 B/s (100 bytes in 1.000s)\r\n'),
            ('adb -s 0123456789abcdef push %s %s' %
                 (mock_file.name, constants.DEVICE_LOCAL_PROPERTIES_PATH),
             '100 B/s (100 bytes in 1.000s)\r\n'),
            ('adb -s 0123456789abcdef shell '
                 'getprop dalvik.vm.enableassertions',
             'all\r\n'),
            ('adb -s 0123456789abcdef shell '
                 'setprop dalvik.vm.enableassertions ""',
             '')]):
-        self.device.SetJavaAsserts(False)
+        self.assertTrue(self.device.SetJavaAsserts(False))
 
   def testSetJavaAsserts_alreadyEnabled(self):
     mock_file = self.mockNamedTemporary(
         read_contents='dalvik.vm.enableassertions=all\n')
     with mock.patch('tempfile.NamedTemporaryFile',
                     return_value=mock_file), (
          mock.patch('__builtin__.open', return_value=mock_file)):
       with self.assertCallsSequence(
           [('adb -s 0123456789abcdef shell ls %s' %
                 constants.DEVICE_LOCAL_PROPERTIES_PATH,
@@ skipping 170 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)