Commit ecd91a88 authored by jbudorick's avatar jbudorick Committed by Commit bot

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

BUG=417705

Review URL: https://codereview.chromium.org/602973004

Cr-Commit-Position: refs/heads/master@{#296736}
parent f136dfbf
...@@ -689,10 +689,14 @@ class DeviceUtils(object): ...@@ -689,10 +689,14 @@ class DeviceUtils(object):
timeout: timeout in seconds timeout: timeout in seconds
retries: number of retries retries: number of retries
Returns:
True if the device-side property changed and a restart is required as a
result, False otherwise.
Raises: Raises:
CommandTimeoutError on timeout. CommandTimeoutError on timeout.
""" """
self.old_interface.SetJavaAssertsEnabled(enabled) return self.old_interface.SetJavaAssertsEnabled(enabled)
@decorators.WithTimeoutAndRetriesFromInstance() @decorators.WithTimeoutAndRetriesFromInstance()
def GetProp(self, property_name, timeout=None, retries=None): def GetProp(self, property_name, timeout=None, retries=None):
......
...@@ -1312,7 +1312,7 @@ class DeviceUtilsSetJavaAssertsTest(DeviceUtilsOldImplTest): ...@@ -1312,7 +1312,7 @@ class DeviceUtilsSetJavaAssertsTest(DeviceUtilsOldImplTest):
('adb -s 0123456789abcdef shell ' ('adb -s 0123456789abcdef shell '
'setprop dalvik.vm.enableassertions "all"', 'setprop dalvik.vm.enableassertions "all"',
'')]): '')]):
self.device.SetJavaAsserts(True) self.assertTrue(self.device.SetJavaAsserts(True))
def testSetJavaAsserts_disable(self): def testSetJavaAsserts_disable(self):
mock_file = self.mockNamedTemporary( mock_file = self.mockNamedTemporary(
...@@ -1336,7 +1336,7 @@ class DeviceUtilsSetJavaAssertsTest(DeviceUtilsOldImplTest): ...@@ -1336,7 +1336,7 @@ class DeviceUtilsSetJavaAssertsTest(DeviceUtilsOldImplTest):
('adb -s 0123456789abcdef shell ' ('adb -s 0123456789abcdef shell '
'setprop dalvik.vm.enableassertions ""', 'setprop dalvik.vm.enableassertions ""',
'')]): '')]):
self.device.SetJavaAsserts(False) self.assertTrue(self.device.SetJavaAsserts(False))
def testSetJavaAsserts_alreadyEnabled(self): def testSetJavaAsserts_alreadyEnabled(self):
mock_file = self.mockNamedTemporary( mock_file = self.mockNamedTemporary(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment